thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-20 14:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update BaseDaemon.cpp

Browse Source 
removed conflict markers from BaseDaemon.cpp
This commit is contained in:
Mallik Hassan 2022-07-26 11:34:17 -03:00 committed by GitHub
parent f7dcf23404
commit 0e68ac4e4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Daemon/BaseDaemon.cpp
View File

@ -1018,10 +1018,6 @@ void BaseDaemon::setupWatchdog()
pf = new OwnJSONPatternFormatter; pf = new OwnJSONPatternFormatter;
else else
pf = new OwnPatternFormatter(true); pf = new OwnPatternFormatter(true);
<<<<<<< HEAD
=======
>>>>>>> removed pFormattterJSON pointer from OwnFormattingChannel and reformatted Loggers and BaseDaemon to look nicer
Poco::AutoPtr<DB::OwnFormattingChannel> log = new DB::OwnFormattingChannel(pf, new Poco::ConsoleChannel(std::cerr)); Poco::AutoPtr<DB::OwnFormattingChannel> log = new DB::OwnFormattingChannel(pf, new Poco::ConsoleChannel(std::cerr));
logger().setChannel(log); logger().setChannel(log);
} }