2 files changed, 14 insertions, 19 deletions

diff --git a/toxcore/logger.c b/toxcore/logger.c
index ff9146d4..933e8d4b 100644
--- a/toxcore/logger.c
+++ b/toxcore/logger.c
@@ -25,7 +25,6 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-
 #include "logger.h"
 
 #ifdef LOGGING
@@ -96,7 +95,7 @@ int logger_init(const char* file_name, LoggerLevel level)
     sprintf(final_l, "%s"/*.%u"*/, file_name, logger_get_pid());
     
     if ( logger.log_file ) { 
-        fprintf(stderr, "Error opening logger name: %s with level %d: %s!\n", final_l, level, strerror(errno));
+        fprintf(stderr, "Error opening logger name: %s with level %d: file already opened!\n", final_l, level);
         free (final_l);
         return -1;
     }
@@ -104,19 +103,15 @@ int logger_init(const char* file_name, LoggerLevel level)
     logger.log_file = fopen(final_l, "ab");
     
     if ( logger.log_file == NULL ) {
-        char error[1000];
-        if ( strerror_r(errno, error, 1000) == 0 ) 
-            fprintf(stderr, "Error opening logger file: %s; info: %s\n", final_l, error);
-        else
-            fprintf(stderr, "Error opening logger file: %s\n", final_l);
-        
+        fprintf(stderr, "Error opening logger file: %s; info: %s\n", final_l, strerror(errno));
+                
         free (final_l);
         return -1;
     }
     
     
     logger.level = level;
-    logger.start_time = current_time();
+    logger.start_time = current_time_monotonic();
     
     
     time_t tim = time(NULL);
@@ -147,10 +142,10 @@ void logger_write (LoggerLevel level, const char* format, ...)
     fflush(logger.log_file);
 }
 
-char* logger_timestr(char* dest)
+char* logger_timestr(char* dest, size_t max_size)
 {
-    uint64_t diff = (current_time() - logger.start_time) / 1000; /* ms */
-    sprintf(dest, "%"PRIu64"", diff);
+    uint64_t diff = (current_time_monotonic() - logger.start_time); /* ms */
+    snprintf(dest, max_size, "%"PRIu64"", diff);
     
     return dest;
 }
diff --git a/toxcore/logger.h b/toxcore/logger.h
index d8292f31..0b6367c5 100644
--- a/toxcore/logger.h
+++ b/toxcore/logger.h
@@ -45,7 +45,7 @@ int logger_init(const char* file_name, LoggerLevel level);
 const char* logger_stringify_level(LoggerLevel level);
 unsigned logger_get_pid();
 void logger_write (LoggerLevel level, const char* format, ...);
-char* logger_timestr (char* dest);
+char* logger_timestr (char* dest, size_t max_size);
 
 #if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
 #define _SFILE (strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__)
@@ -53,16 +53,16 @@ char* logger_timestr (char* dest);
 #define _SFILE (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
 #endif
 
-#define WRITE_FORMAT(__LEVEL__, format) char* the_str = calloc(sizeof(char), strlen(format)+ 500); sprintf(the_str, "\n[%u] [%s] [%s] [%s:%d %s()] %s", \
-                             logger_get_pid(), logger_stringify_level(__LEVEL__), logger_timestr(__time__), _SFILE, __LINE__, __func__, format)
+#define WRITE_FORMAT(__LEVEL__, format) char __time__[20]; char* the_str = calloc(sizeof(char), strlen(format)+ 500); sprintf(the_str, "\n[%u] [%s] [%s] [%s:%d %s()] %s", \
+                             logger_get_pid(), logger_stringify_level(__LEVEL__), logger_timestr(__time__, 20), _SFILE, __LINE__, __func__, format)
 
 /* Use these macros */
 
 #define LOGGER_INIT(name, level) logger_init(name, level);
-#define LOGGER_INFO(format, ...) do { char __time__[20]; WRITE_FORMAT(INFO, format); logger_write( INFO, the_str, ##__VA_ARGS__ ); free(the_str); } while (0)
-#define LOGGER_DEBUG(format, ...) do { char __time__[20]; WRITE_FORMAT(DEBUG, format); logger_write( DEBUG, the_str, ##__VA_ARGS__ ); free(the_str); } while (0)
-#define LOGGER_WARNING(format, ...) do { char __time__[20]; WRITE_FORMAT(WARNING, format); logger_write( WARNING, the_str, ##__VA_ARGS__ ); free(the_str); } while (0)
-#define LOGGER_ERROR(format, ...) do { char __time__[20]; WRITE_FORMAT(ERROR, format); logger_write( ERROR, the_str, ##__VA_ARGS__ ); free(the_str); } while (0)
+#define LOGGER_INFO(format, ...) do { WRITE_FORMAT(INFO, format); logger_write( INFO, the_str, ##__VA_ARGS__ ); free(the_str); } while (0)
+#define LOGGER_DEBUG(format, ...) do { WRITE_FORMAT(DEBUG, format); logger_write( DEBUG, the_str, ##__VA_ARGS__ ); free(the_str); } while (0)
+#define LOGGER_WARNING(format, ...) do { WRITE_FORMAT(WARNING, format); logger_write( WARNING, the_str, ##__VA_ARGS__ ); free(the_str); } while (0)
+#define LOGGER_ERROR(format, ...) do { WRITE_FORMAT(ERROR, format); logger_write( ERROR, the_str, ##__VA_ARGS__ ); free(the_str); } while (0)
 
 /* To do some checks or similar only when logging use this */
 #define LOGGER_SCOPE(__SCOPE_DO__) do { __SCOPE_DO__ } while(0)