Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
8602f7b4
C
ClickHouse
项目概览
2dot5
/
ClickHouse
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
ClickHouse
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8602f7b4
编写于
5月 08, 2020
作者:
P
Pavel Kovalenko
提交者:
Pavel Kovalenko
5月 08, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Minor updates in proxy resolver parameters naming.
上级
6165c2aa
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
9 addition
and
9 deletion
+9
-9
src/Disks/S3/DiskS3.h
src/Disks/S3/DiskS3.h
+1
-1
src/Disks/S3/registerDiskS3.cpp
src/Disks/S3/registerDiskS3.cpp
+6
-6
tests/integration/test_s3_with_proxy/configs/config.d/storage_conf.xml
...tion/test_s3_with_proxy/configs/config.d/storage_conf.xml
+2
-2
未找到文件。
src/Disks/S3/DiskS3.h
浏览文件 @
8602f7b4
#pragma once
#include "Disks/DiskFactory.h"
#include "Proxy
List
Configuration.h"
#include "ProxyConfiguration.h"
#include <aws/s3/S3Client.h>
#include <Poco/DirectoryIterator.h>
...
...
src/Disks/S3/registerDiskS3.cpp
浏览文件 @
8602f7b4
...
...
@@ -40,15 +40,15 @@ namespace
std
::
shared_ptr
<
S3
::
ProxyResolverConfiguration
>
getProxyResolverConfiguration
(
const
Poco
::
Util
::
AbstractConfiguration
*
proxy_resolver_config
)
{
auto
endpoint
=
Poco
::
URI
(
proxy_resolver_config
->
getString
(
"endpoint"
));
auto
scheme
=
proxy_resolver_config
->
getString
(
"
scheme"
);
if
(
scheme
!=
"http"
&&
scheme
!=
"https"
)
throw
Exception
(
"Only HTTP/HTTPS schemas allowed in proxy resolver config: "
+
scheme
,
ErrorCodes
::
BAD_ARGUMENTS
);
auto
p
ort
=
proxy_resolver_config
->
getUInt
(
"
port"
);
auto
proxy_scheme
=
proxy_resolver_config
->
getString
(
"proxy_
scheme"
);
if
(
proxy_scheme
!=
"http"
&&
proxy_
scheme
!=
"https"
)
throw
Exception
(
"Only HTTP/HTTPS schemas allowed in proxy resolver config: "
+
proxy_
scheme
,
ErrorCodes
::
BAD_ARGUMENTS
);
auto
p
roxy_port
=
proxy_resolver_config
->
getUInt
(
"proxy_
port"
);
LOG_DEBUG
(
&
Logger
::
get
(
"DiskS3"
),
"Configured proxy resolver: "
<<
endpoint
.
toString
()
<<
", Scheme: "
<<
scheme
<<
", Port: "
<<
port
);
&
Logger
::
get
(
"DiskS3"
),
"Configured proxy resolver: "
<<
endpoint
.
toString
()
<<
", Scheme: "
<<
proxy_scheme
<<
", Port: "
<<
proxy_
port
);
return
std
::
make_shared
<
S3
::
ProxyResolverConfiguration
>
(
endpoint
,
scheme
,
port
);
return
std
::
make_shared
<
S3
::
ProxyResolverConfiguration
>
(
endpoint
,
proxy_scheme
,
proxy_
port
);
}
std
::
shared_ptr
<
S3
::
ProxyListConfiguration
>
getProxyListConfiguration
(
const
Poco
::
Util
::
AbstractConfiguration
*
proxy_config
)
...
...
tests/integration/test_s3_with_proxy/configs/config.d/storage_conf.xml
浏览文件 @
8602f7b4
...
...
@@ -19,8 +19,8 @@
<proxy>
<resolver>
<endpoint>
http://resolver:8080
</endpoint>
<
scheme>
http
</
scheme>
<p
ort>
8888
</
port>
<
proxy_scheme>
http
</proxy_
scheme>
<p
roxy_port>
8888
</proxy_
port>
</resolver>
</proxy>
</s3_with_resolver>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录