Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not write preprocessed configs to /etc/ #2443

Merged
merged 207 commits into from
Nov 27, 2018
Merged
Changes from 1 commit
Commits
Show all changes
207 commits
Select commit Hold shift + click to select a range
42688cb
Show error to client if query was killed
proller Mar 2, 2018
cefa17d
Merge remote-tracking branch 'upstream/master' into fix14
proller Mar 2, 2018
2d0b1d6
Kill exception v2
proller Mar 2, 2018
5734ae5
Use kill
proller Mar 2, 2018
24a4eb7
fix
proller Mar 2, 2018
9bb0ea1
Merge remote-tracking branch 'upstream/master' into fix14
proller Mar 3, 2018
b71c5ee
wip
proller Mar 5, 2018
6acf13d
fix
proller Mar 5, 2018
7057d48
fxi
proller Mar 5, 2018
eb76e4c
try fix
proller Mar 5, 2018
c2cd722
Revert "try fix"
proller Mar 5, 2018
7d631e8
Merge remote-tracking branch 'upstream/master' into fix14
proller Mar 5, 2018
cf64534
QUERY_WASCANCELLED
proller Mar 5, 2018
8fa6eda
Fxi all cancel()
proller Mar 5, 2018
e85c21b
fix
proller Mar 5, 2018
608282e
Merge remote-tracking branch 'upstream/master' into fix14
proller Mar 5, 2018
4e57e40
Merge remote-tracking branch 'upstream/master' into fix14
proller Mar 6, 2018
93f0160
Merge remote-tracking branch 'upstream/master' into fix14
proller Mar 6, 2018
45d745f
Merge remote-tracking branch 'upstream/master' into fix14
proller Mar 7, 2018
a23b94f
Merge remote-tracking branch 'upstream/master' into fix14
proller Mar 7, 2018
6b4a7ee
Merge remote-tracking branch 'upstream/master' into fix14
proller Mar 7, 2018
26247b5
Merge remote-tracking branch 'upstream/master' into fix14
proller Mar 7, 2018
5511bd2
Merge remote-tracking branch 'upstream/master' into fix14
proller Mar 7, 2018
23d5cdb
Merge remote-tracking branch 'upstream/master' into fix14
proller Mar 7, 2018
af57d85
Merge remote-tracking branch 'upstream/master' into fix14
proller Mar 12, 2018
052619b
Merge remote-tracking branch 'upstream/master' into fix14
proller Mar 14, 2018
7ce3eca
Merge remote-tracking branch 'upstream/master' into fix14
proller Mar 14, 2018
813fcd2
Client: use ConfigProcessor
proller Mar 14, 2018
dd73910
Merge remote-tracking branch 'upstream/master' into fix14
proller Mar 14, 2018
fdc488e
Fix build with old poco
proller Mar 30, 2018
38fbd29
CLICKHOUSE-3675 Add glibc version test
proller Mar 30, 2018
2482bf5
Merge remote-tracking branch 'upstream/master' into fix14
proller Mar 30, 2018
c7848f0
Fix zookeeper tools compile
proller Mar 30, 2018
0f39ec3
Merge remote-tracking branch 'upstream/master' into fix14
proller Mar 30, 2018
421289b
Merge remote-tracking branch 'upstream/master' into fix14
proller Mar 30, 2018
b4a8c2b
start
proller Apr 2, 2018
dcc6700
Merge remote-tracking branch 'upstream/master' into fix14
proller Apr 3, 2018
9c62be8
Merge remote-tracking branch 'upstream/master' into fix14
proller Apr 3, 2018
28e6f17
Merge remote-tracking branch 'upstream/master' into fix14
proller Apr 4, 2018
e54ad20
Merge remote-tracking branch 'upstream/master' into fix14
proller Apr 5, 2018
07e2571
wip
proller Apr 6, 2018
81c2375
Merge remote-tracking branch 'upstream/master' into fix14
proller Apr 6, 2018
a75b679
wip
proller Apr 6, 2018
88a56a4
wip
proller Apr 6, 2018
5cd856a
wip
proller Apr 6, 2018
98cc81d
Merge remote-tracking branch 'upstream/master' into fix14
proller Apr 6, 2018
9d5294f
Merge remote-tracking branch 'upstream/master' into fix14
proller Apr 6, 2018
8dd05bb
wip
proller Apr 6, 2018
d6265aa
Merge remote-tracking branch 'upstream/master' into fix14
proller Apr 6, 2018
8037365
Merge remote-tracking branch 'upstream/master' into fix14
proller Apr 7, 2018
457ee7b
Merge remote-tracking branch 'upstream/master' into fix14
proller Apr 7, 2018
2b8b9bb
Merge remote-tracking branch 'upstream/master' into fix14
proller Apr 9, 2018
db2f66a
Merge remote-tracking branch 'upstream/master' into fix14
proller Apr 9, 2018
c7a7ffe
Fix clickhouse-server.postinst
proller Apr 9, 2018
2d76466
clean
proller Apr 9, 2018
de79342
wip
proller Apr 9, 2018
1beea71
clean
proller Apr 9, 2018
9a1e8a1
Merge remote-tracking branch 'upstream/master' into fix14
proller Apr 9, 2018
f7e77c8
clean
proller Apr 9, 2018
4c4667a
clean
proller Apr 9, 2018
48f7f2d
wip
proller Apr 10, 2018
82f8c03
clean
proller Apr 10, 2018
2b43dfe
Merge remote-tracking branch 'upstream/master' into fix14
proller Apr 10, 2018
3f9a02d
Merge remote-tracking branch 'upstream/master' into fix14
proller Apr 11, 2018
810ae94
Merge remote-tracking branch 'upstream/master' into fix14
proller Apr 13, 2018
b45b8c8
Merge remote-tracking branch 'upstream/master' into fix14
proller Apr 13, 2018
95ba22e
Update dump_variable.cpp
alexey-milovidov Apr 13, 2018
2caa18e
Merge remote-tracking branch 'upstream/master' into fix14
proller Apr 16, 2018
3bca254
Merge remote-tracking branch 'upstream/master' into fix14
proller Apr 26, 2018
95586f1
debug client_name
proller Apr 26, 2018
9fb92da
Merge remote-tracking branch 'upstream/master' into fix14
proller May 8, 2018
9f162c8
Merge remote-tracking branch 'upstream/master' into fix14
proller May 10, 2018
510f276
Merge remote-tracking branch 'upstream/master' into fix14
proller May 10, 2018
9082f91
Merge remote-tracking branch 'upstream/master' into fix14
proller May 11, 2018
a959c43
Merge remote-tracking branch 'upstream/master' into fix14
proller May 11, 2018
c4c3866
Merge remote-tracking branch 'upstream/master' into fix14
proller May 11, 2018
2a9239a
Merge remote-tracking branch 'upstream/master' into fix14
proller May 11, 2018
f0dac1e
Merge remote-tracking branch 'upstream/master' into fix14
proller May 15, 2018
4cae94f
Merge remote-tracking branch 'upstream/master' into fix14
proller May 16, 2018
6263028
Adds percent encoding for "update_field" parameter Handles cases when…
May 11, 2018
51985c3
Now uses Poco::URI::addQueryParameter for "update_field" parameter
May 16, 2018
42bf2aa
Merge remote-tracking branch 'upstream/master' into fix14
proller May 18, 2018
d9747ef
Merge branch 'fix14' of https://github.com/proller/ClickHouse into fix14
proller May 18, 2018
d615dd1
Merge remote-tracking branch 'upstream/master' into fix14
proller May 18, 2018
2a11d00
Merge remote-tracking branch 'upstream/master' into fix14
proller May 21, 2018
7700dd9
Merge remote-tracking branch 'upstream/master' into fix14
proller May 22, 2018
727b79e
Merge remote-tracking branch 'upstream/master' into fix14
proller May 23, 2018
cfd4580
Merge remote-tracking branch 'upstream/master' into fix14
proller May 29, 2018
64d712a
Merge remote-tracking branch 'upstream/master' into fix14
proller May 29, 2018
75cc696
Merge remote-tracking branch 'upstream/master' into fix14
proller May 29, 2018
2be735d
Do not write preprocessed configs to /etc/ : code
proller May 29, 2018
2190cb3
Do not chown /etc/*
proller May 29, 2018
c1f2dd4
symlink
proller May 29, 2018
11ddf0d
fix
proller May 29, 2018
3a8de70
Merge remote-tracking branch 'upstream/master' into fix14
proller May 31, 2018
37b7545
fix
proller May 31, 2018
09b25c6
Merge remote-tracking branch 'upstream/master' into fix14
proller Jun 1, 2018
4156255
Merge remote-tracking branch 'upstream/master' into fix14
proller Jun 4, 2018
3a317d5
Merge remote-tracking branch 'upstream/master' into fix14
proller Jun 4, 2018
9b10ae8
Merge remote-tracking branch 'upstream/master' into fix14
proller Jun 5, 2018
d680733
Merge remote-tracking branch 'upstream/master' into fix14
proller Jun 20, 2018
373f705
Merge branch 'fix14' of https://github.com/proller/ClickHouse into fix14
proller Jul 11, 2018
d2856ae
Merge remote-tracking branch 'upstream/master' into fix14
proller Jul 11, 2018
2943388
Merge remote-tracking branch 'upstream/master' into fix14
proller Jul 20, 2018
e5a7ef7
Merge remote-tracking branch 'upstream/master' into fix14
proller Jul 23, 2018
e7a04f9
Merge remote-tracking branch 'upstream/master' into fix14
proller Jul 27, 2018
a734c26
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 8, 2018
59a7376
fix mistype
blinkov Aug 8, 2018
939e067
Add new error in fetchPartition op
alesapin Aug 8, 2018
58ac388
Auto version update to [18.10.0] [54405]
Aug 9, 2018
80cea5e
Removed obsolete variable [#CLICKHOUSE-2]
alexey-milovidov Aug 9, 2018
864e39b
Fixed link order #2807
alexey-milovidov Aug 9, 2018
32e558f
Update CHANGELOG.md
alexey-milovidov Aug 9, 2018
043dc07
Update CHANGELOG_RU.md
alexey-milovidov Aug 9, 2018
143b33c
Revert. Fixed link order #2807
alexey-milovidov Aug 9, 2018
58e3f85
Fixed link order #2807
alexey-milovidov Aug 9, 2018
4bf344d
Revert "Fixed link order #2807"
alexey-milovidov Aug 9, 2018
b826b86
Better CMakeLists for rdkafka library [#CLICKHOUSE-2]
alexey-milovidov Aug 9, 2018
dae51fc
Better CMakeLists for rdkafka library [#CLICKHOUSE-2]
alexey-milovidov Aug 9, 2018
e2a7ec7
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 9, 2018
c8993e8
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 10, 2018
403c9b0
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 17, 2018
a7fecbf
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 20, 2018
d9f7750
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 20, 2018
026313a
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 20, 2018
e7e434c
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 21, 2018
9127d10
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 21, 2018
7e76e22
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 21, 2018
fb3411a
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 22, 2018
0ee5291
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 23, 2018
1203f7b
debug
proller Aug 23, 2018
d37a84f
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 23, 2018
9fcd3e4
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 23, 2018
0543d5c
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 23, 2018
e740c06
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 24, 2018
e4f5333
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 24, 2018
b03d105
wip
proller Aug 24, 2018
ad82517
wip
proller Aug 24, 2018
b0d1240
clean
proller Aug 24, 2018
98cc5c4
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 24, 2018
f3d9d1c
no links
proller Aug 24, 2018
3752d53
link
proller Aug 24, 2018
c7785f2
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 27, 2018
67dbf63
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 27, 2018
49d686b
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 27, 2018
5f2ee29
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 28, 2018
79f90b2
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 28, 2018
c180a52
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 28, 2018
ff362a9
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 29, 2018
1aa57e2
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 29, 2018
32545a7
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 29, 2018
249ab9e
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 29, 2018
deb7a50
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 29, 2018
f0cb7d2
clean
proller Aug 29, 2018
05db512
systemd ln
proller Aug 30, 2018
6b79648
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 30, 2018
30b591e
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 30, 2018
0e97fd4
Some requested changes
proller Aug 30, 2018
0b858f0
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 30, 2018
d9144ab
bad
proller Aug 30, 2018
ce0650e
Merge remote-tracking branch 'upstream/master' into fix14
proller Aug 31, 2018
1e650ed
Merge remote-tracking branch 'upstream/master' into fix14
proller Sep 1, 2018
b55996f
Merge remote-tracking branch 'upstream/master' into fix14
proller Sep 3, 2018
86c4c47
Merge remote-tracking branch 'upstream/master' into fix14
proller Sep 5, 2018
2966b7a
Merge remote-tracking branch 'upstream/master' into fix14
proller Sep 6, 2018
d9b9158
Merge remote-tracking branch 'upstream/master' into fix14
proller Sep 7, 2018
f957418
Merge remote-tracking branch 'upstream/master' into fix14
proller Sep 28, 2018
839f4e2
Merge remote-tracking branch 'upstream/master' into fix14
proller Oct 1, 2018
2d49c5b
Merge remote-tracking branch 'upstream/master' into fix14
proller Oct 1, 2018
3547394
Merge remote-tracking branch 'origin/fix14' into fix14
proller Oct 2, 2018
ac13ba4
Merge remote-tracking branch 'upstream/master' into fix14
proller Oct 2, 2018
ea26b71
Merge remote-tracking branch 'upstream/master' into fix14
proller Oct 2, 2018
7fe5b7f
Requested changes, add DB:: namespace to ConfigProcessor
proller Oct 2, 2018
5e1427c
Add comment
proller Oct 4, 2018
306f05c
Merge remote-tracking branch 'upstream/master' into fix14
proller Oct 4, 2018
dacf9ee
fix
proller Oct 15, 2018
cb3dd2e
Merge remote-tracking branch 'upstream/master' into fix14
proller Oct 15, 2018
411d26f
try remove old *-preprocessed.xml
proller Oct 15, 2018
fec9b84
wip
proller Oct 15, 2018
ccc46be
DBMS_DEFAULT_PATH
proller Oct 16, 2018
e39d7f0
fix
proller Oct 16, 2018
bb66083
Merge remote-tracking branch 'upstream/master' into fix14
proller Oct 16, 2018
5ad7fec
Merge remote-tracking branch 'upstream/master' into fix14
proller Oct 17, 2018
836cafe
Merge remote-tracking branch 'upstream/master' into fix14
proller Oct 18, 2018
3661d1f
Merge remote-tracking branch 'upstream/master' into fix14
proller Oct 22, 2018
7c8ce19
Merge remote-tracking branch 'upstream/master' into fix14
proller Oct 25, 2018
2dc9cce
fix
proller Oct 26, 2018
6d9bfec
Merge remote-tracking branch 'upstream/master' into fix14
proller Oct 26, 2018
b924ded
Merge remote-tracking branch 'upstream/master' into fix14
proller Oct 26, 2018
18ffa30
Merge remote-tracking branch 'upstream/master' into fix14
proller Oct 29, 2018
feeedbc
Merge remote-tracking branch 'upstream/master' into fix14
proller Oct 30, 2018
b1f8a14
Merge remote-tracking branch 'upstream/master' into fix14
proller Oct 30, 2018
12665a1
Merge remote-tracking branch 'upstream/master' into fix14
proller Nov 1, 2018
aa7ce15
Merge remote-tracking branch 'upstream/master' into fix14
proller Nov 1, 2018
f956996
Merge remote-tracking branch 'upstream/master' into fix14
proller Nov 2, 2018
ec36c1d
Merge remote-tracking branch 'upstream/master' into fix14
proller Nov 7, 2018
957bcd9
Merge remote-tracking branch 'upstream/master' into fix14
proller Nov 8, 2018
a21027a
fix
proller Nov 8, 2018
a20d30a
Merge remote-tracking branch 'upstream/master' into fix14
proller Nov 9, 2018
07d7e9c
Merge remote-tracking branch 'upstream/master' into fix14
proller Nov 12, 2018
3d273b8
Merge remote-tracking branch 'upstream/master' into fix14
proller Nov 14, 2018
f8c87e9
Update ConfigProcessor.cpp
alexey-milovidov Nov 24, 2018
448fc41
Merge remote-tracking branch 'upstream/master' into fix14
proller Nov 26, 2018
98894ff
doc
proller Nov 26, 2018
f8ac625
Merge remote-tracking branch 'upstream/master' into fix14
proller Nov 26, 2018
318c7ec
hide main_config_path
proller Nov 26, 2018
9ede2a0
Merge remote-tracking branch 'upstream/master' into fix14
proller Nov 27, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Client: use ConfigProcessor
  • Loading branch information
proller committed Mar 14, 2018
commit 813fcd2ccf35c2d3012b62111b4288b4e4e702cc
17 changes: 13 additions & 4 deletions dbms/src/Server/Client.cpp
Original file line number Diff line number Diff line change
@@ -28,6 +28,7 @@
#include <Common/Throttler.h>
#include <Common/StringUtils/StringUtils.h>
#include <Common/typeid_cast.h>
#include <Common/Config/ConfigProcessor.h>
#include <Core/Types.h>
#include <Core/QueryProcessingStage.h>
#include <IO/ReadBufferFromFileDescriptor.h>
@@ -175,14 +176,22 @@ class Client : public Poco::Util::Application
if (home_path_cstr)
home_path = home_path_cstr;

std::string config_path;
if (config().has("config-file"))
loadConfiguration(config().getString("config-file"));
config_path = config().getString("config-file");
else if (Poco::File("./clickhouse-client.xml").exists())
loadConfiguration("./clickhouse-client.xml");
config_path = "./clickhouse-client.xml";
else if (!home_path.empty() && Poco::File(home_path + "/.clickhouse-client/config.xml").exists())
loadConfiguration(home_path + "/.clickhouse-client/config.xml");
config_path = home_path + "/.clickhouse-client/config.xml";
else if (Poco::File("/etc/clickhouse-client/config.xml").exists())
loadConfiguration("/etc/clickhouse-client/config.xml");
config_path = "/etc/clickhouse-client/config.xml";

if (!config_path.empty())
{
ConfigProcessor config_processor(config_path);
auto loaded_config = config_processor.loadConfig();
config().add(loaded_config.configuration);
}

context.setApplicationType(Context::ApplicationType::CLIENT);