Skip to content

Commit 224a4b4

Browse files
author
herbert koelman
committed
Merge branch '134_and_133' into 128-fix-code-smells
2 parents d9a23a7 + 76d3a0c commit 224a4b4

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

include/logger/sinks.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ namespace logger {
118118
*
119119
* @param name subset name.
120120
*/
121-
virtual void set_name (const std::string &name);
121+
void set_name (const std::string &name);
122122

123123
private:
124124
#if __cplusplus >= 201703L
@@ -175,15 +175,15 @@ namespace logger {
175175
* This sink writes messages in FILE.
176176
*
177177
*/
178-
void write(log_level level, const char *fmt, ...) override ;
178+
void write(log_level level, const char *fmt, ...) ;
179179

180180
protected:
181181

182182
/** Set sybsystem name and reset fixed part of the output pattern.
183183
*
184184
* @param name sink name
185185
*/
186-
void set_name(const std::string &name) override ;
186+
void set_name(const std::string &name) ;
187187

188188
/** fill the buffer with the current date and time information
189189
*/
@@ -301,7 +301,7 @@ namespace logger {
301301

302302
protected:
303303

304-
void set_name(const std::string &name) override ;
304+
void set_name(const std::string &name) ;
305305

306306
private:
307307
std::string _pattern; //!< message pattern (layout)

src/syslog_sink.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace logger {
2222
syslog_sink::syslog_sink(const std::string &name, const std::string &pname, log_level level, const syslog::facility &facility, int options):
2323
sink(name, pname, level) {
2424

25-
try {
25+
// try {
2626
#ifdef DEBUG
2727
printf("DEBUG %s name: %s, pname: %s, level: %d, facility: %d, options: %d\n", __FUNCTION__,
2828
name.c_str(),
@@ -49,9 +49,9 @@ namespace logger {
4949

5050
openlog(program_name().c_str(), options, (int)facility.code());
5151

52-
} catch ( std::exception &err ){
53-
throw logger_exception(err.what());
54-
}
52+
// } catch ( std::exception &err ){
53+
// throw logger_exception(err.what());
54+
// }
5555
};
5656

5757
syslog_sink::syslog_sink(const std::string &name, const std::string &pname, log_level level) :

0 commit comments

Comments
 (0)