diff options
author | Maxim Biro <nurupo.contributions@gmail.com> | 2018-06-28 21:01:13 -0400 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2018-08-30 22:44:18 +0000 |
commit | 2e4cae692e0895ce17e67fb2e1fd899c91fcb675 (patch) | |
tree | 425ccaf3f21f43e2a6fa41989fc1af9446576584 /other/bootstrap_daemon/src | |
parent | deb82006e5532693c07726e2eaedcc38c7bc050d (diff) |
Use our own logging facility to log toxcore's logs
Diffstat (limited to 'other/bootstrap_daemon/src')
-rw-r--r-- | other/bootstrap_daemon/src/tox-bootstrapd.c | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/other/bootstrap_daemon/src/tox-bootstrapd.c b/other/bootstrap_daemon/src/tox-bootstrapd.c index 45c378f6..c26ef54f 100644 --- a/other/bootstrap_daemon/src/tox-bootstrapd.c +++ b/other/bootstrap_daemon/src/tox-bootstrapd.c | |||
@@ -178,42 +178,40 @@ static void daemonize(LOG_BACKEND log_backend, char *pid_file_path) | |||
178 | } | 178 | } |
179 | } | 179 | } |
180 | 180 | ||
181 | void print_log(void *context, LOGGER_LEVEL level, const char *file, int line, | 181 | // Logs toxcore logger message using our logger facility |
182 | const char *func, const char *message, void *userdata) | ||
183 | { | ||
184 | if (MIN_LOGGER_LEVEL != LOG_TRACE && MIN_LOGGER_LEVEL != LOG_DEBUG) { | ||
185 | return; | ||
186 | } | ||
187 | 182 | ||
188 | char *strlevel; | 183 | static void toxcore_logger_callback(void *context, Logger_Level level, const char *file, int line, |
184 | const char *func, const char *message, void *userdata) | ||
185 | { | ||
186 | LOG_LEVEL log_level; | ||
189 | 187 | ||
190 | switch (level) { | 188 | switch (level) { |
191 | case LOG_TRACE: | 189 | case LOGGER_LEVEL_TRACE: |
192 | strlevel = "TRACE"; | 190 | log_level = LOG_LEVEL_INFO; |
193 | break; | 191 | break; |
194 | 192 | ||
195 | case LOG_DEBUG: | 193 | case LOGGER_LEVEL_DEBUG: |
196 | strlevel = "DEBUG"; | 194 | log_level = LOG_LEVEL_INFO; |
197 | break; | 195 | break; |
198 | 196 | ||
199 | case LOG_INFO: | 197 | case LOGGER_LEVEL_INFO: |
200 | strlevel = "INFO"; | 198 | log_level = LOG_LEVEL_INFO; |
201 | break; | 199 | break; |
202 | 200 | ||
203 | case LOG_WARNING: | 201 | case LOGGER_LEVEL_WARNING: |
204 | strlevel = "WARNING"; | 202 | log_level = LOG_LEVEL_WARNING; |
205 | break; | 203 | break; |
206 | 204 | ||
207 | case LOG_ERROR: | 205 | case LOGGER_LEVEL_ERROR: |
208 | strlevel = "ERROR"; | 206 | log_level = LOG_LEVEL_ERROR; |
209 | break; | 207 | break; |
210 | 208 | ||
211 | default: | 209 | default: |
212 | strlevel = "<unknown>"; | 210 | log_level = LOG_LEVEL_INFO; |
213 | break; | 211 | break; |
214 | } | 212 | } |
215 | 213 | ||
216 | fprintf(stderr, "[%s] %s:%d(%s) %s\n", strlevel, file, line, func, message); | 214 | log_write(log_level, "%s:%d(%s) %s\n", file, line, func, message); |
217 | } | 215 | } |
218 | 216 | ||
219 | int main(int argc, char *argv[]) | 217 | int main(int argc, char *argv[]) |
@@ -269,7 +267,10 @@ int main(int argc, char *argv[]) | |||
269 | ip_init(&ip, enable_ipv6); | 267 | ip_init(&ip, enable_ipv6); |
270 | 268 | ||
271 | Logger *logger = logger_new(); | 269 | Logger *logger = logger_new(); |
272 | logger_callback_log(logger, print_log, nullptr, nullptr); | 270 | |
271 | if (MIN_LOGGER_LEVEL == LOGGER_LEVEL_TRACE || MIN_LOGGER_LEVEL == LOGGER_LEVEL_DEBUG) { | ||
272 | logger_callback_log(logger, toxcore_logger_callback, nullptr, nullptr); | ||
273 | } | ||
273 | 274 | ||
274 | Networking_Core *net = new_networking(logger, ip, port); | 275 | Networking_Core *net = new_networking(logger, ip, port); |
275 | 276 | ||