Merge pull request #93 from hi-rajat-kumar/master

Remove redundant callback logic for --logtostderr enablement.

Author: hi-rajat-kumar

lib.h

@@ -55,9 +55,6 @@ struct callbacks {
         void (*log_info)(void *logger, const char *file, int line,
                          const char *function, const char *format, ...)
             __attribute__((format(printf, 5, 6)));
-
-        /* Notify the logger to log to stderr. */
-        void (*logtostderr)(void *logger);
 };
 
 struct options {

logging.c

@@ -30,7 +30,6 @@
 /* TODO remove global variables */
 static int stdout_lines;
 static FILE *log_file;
-static bool g_logtostderr;
 
 static void print(void *logger, const char *key, const char *value_fmt, ...)
 {
@@ -144,7 +143,7 @@ static void logging(const char *file, int line, const char *func,
         if (thread_id == -1)
                 thread_id = getpid();
         path = strdup(file);
-        fprintf(g_logtostderr ? stderr : log_file,
+        fprintf(log_file,
                 "%c%02d%02d %02d:%02d:%02d.%06ld %3d %6d %s:%d] %s: %s\n",
                 level_char, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min,
                 tm.tm_sec, ts.tv_nsec / 1000, stdout_lines, thread_id,
@@ -156,7 +155,7 @@ static void logging(const char *file, int line, const char *func,
         if (size > sizeof(buf))
                 free(msg);
         if (level == FATAL || level == ERROR || level == WARNING)
-                fflush(g_logtostderr ? stderr : log_file);
+                fflush(log_file);
         if (level == FATAL) {
                 fclose(log_file);
                 fflush(stdout);
@@ -205,11 +204,6 @@ static void log_info(void *logger, const char *file, int line,
         va_end(argp);
 }
 
-static void logtostderr(void *logger)
-{
-        g_logtostderr = true;
-}
-
 static void logtonull()
 {
         log_file = fopen("/dev/null", "w");
@@ -246,7 +240,6 @@ void logging_init(struct callbacks *cb, int argc, char **argv)
         cb->log_error = log_error;
         cb->log_warn = log_warn;
         cb->log_info = log_info;
-        cb->logtostderr = logtostderr;
 }
 
 void logging_exit(struct callbacks *cb)

psp_crr_main.c

@@ -40,8 +40,6 @@ int main(int argc, char **argv)
 
         /* Now parse the command line arguments */
         flags_parser_run(fp, argc, argv);
-        if (opts.logtostderr)
-                cb.logtostderr(cb.logger);
         flags_parser_dump(fp);
         flags_parser_destroy(fp);
 

psp_rr_main.c

@@ -39,8 +39,6 @@ int main(int argc, char **argv)
         fp = add_flags_tcp_rr(fp);
 
         flags_parser_run(fp, argc, argv);
-        if (opts.logtostderr)
-                cb.logtostderr(cb.logger);
         flags_parser_dump(fp);
         flags_parser_destroy(fp);
 

psp_stream_main.c

@@ -38,8 +38,6 @@ int main(int argc, char **argv)
         fp = add_flags_tcp_stream(fp);
 
         flags_parser_run(fp, argc, argv);
-        if (opts.logtostderr)
-                cb.logtostderr(cb.logger);
 
         if (opts.enable_tcp_maerts) {
                 opts.enable_read = opts.client;

tcp_crr_main.c

@@ -40,8 +40,6 @@ int main(int argc, char **argv)
 
         /* Now parse the command line arguments */
         flags_parser_run(fp, argc, argv);
-        if (opts.logtostderr)
-                cb.logtostderr(cb.logger);
         flags_parser_dump(fp);
         flags_parser_destroy(fp);
 

tcp_rr_main.c

@@ -39,8 +39,6 @@ int main(int argc, char **argv)
         fp = add_flags_tcp_rr(fp);
 
         flags_parser_run(fp, argc, argv);
-        if (opts.logtostderr)
-                cb.logtostderr(cb.logger);
         flags_parser_dump(fp);
         flags_parser_destroy(fp);
 

tcp_stream_main.c

@@ -38,8 +38,6 @@ int main(int argc, char **argv)
         fp = add_flags_tcp_stream(fp);
 
         flags_parser_run(fp, argc, argv);
-        if (opts.logtostderr)
-                cb.logtostderr(cb.logger);
 
         if (opts.enable_tcp_maerts) {
                 opts.enable_read = opts.client;

udp_rr_main.c

@@ -40,8 +40,6 @@ int main(int argc, char **argv)
         fp = add_flags_udp_rr(fp);
 
         flags_parser_run(fp, argc, argv);
-        if (opts.logtostderr)
-                cb.logtostderr(cb.logger);
         flags_parser_dump(fp);
         flags_parser_destroy(fp);
 

udp_stream_main.c

@@ -38,8 +38,6 @@ int main(int argc, char **argv)
         fp = add_flags_udp_stream(fp);
 
         flags_parser_run(fp, argc, argv);
-        if (opts.logtostderr)
-                cb.logtostderr(cb.logger);
 
         if (opts.client)
                 opts.enable_write = true;