Fix some issues with the last stats.cpp fix.

[cubemap] / stats.cpp

diff --git a/stats.cpp b/stats.cpp
index f5916edf2fb696530fe081cad9eee503457c8a70..b2bca75970f800a6cf3f21517e243e3aed89cacd 100644 (file)
--- a/stats.cpp
+++ b/stats.cpp
@@ -1,15 +1,16 @@
+#include <errno.h>
 #include <fcntl.h>
+#include <poll.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include <sys/poll.h>
-#include <errno.h>
 #include <vector>
 
 #include "client.h"
+#include "log.h"
 #include "serverpool.h"
 #include "stats.h"
 
@@ -35,16 +36,20 @@ void StatsThread::do_work()
                char *filename = strdup((stats_file + ".new.XXXXXX").c_str());
                fd = mkostemp(filename, O_WRONLY);
                if (fd == -1) {
-                       perror(filename);
+                       log_perror(filename);
                        free(filename);
                        goto sleep;
                }
 
                fp = fdopen(fd, "w");
                if (fp == NULL) {
-                       perror("fdopen");
-                       close(fd);
-                       unlink(filename);
+                       log_perror("fdopen");
+                       if (close(fd) == -1) {
+                               log_perror("close");
+                       }
+                       if (unlink(filename) == -1) {
+                               log_perror(filename);
+                       }
                        free(filename);
                        goto sleep;
                }
@@ -52,8 +57,10 @@ void StatsThread::do_work()
                now = time(NULL);
                client_stats = servers->get_client_stats();
                for (size_t i = 0; i < client_stats.size(); ++i) {
-                       fprintf(fp, "%s %s %d %llu %llu %llu\n",
+                       fprintf(fp, "%s %d %d %s %d %llu %llu %llu\n",
                                client_stats[i].remote_addr.c_str(),
+                               client_stats[i].sock,
+                               client_stats[i].fwmark,
                                client_stats[i].stream_id.c_str(),
                                int(now - client_stats[i].connect_time),
                                (long long unsigned)(client_stats[i].bytes_sent),
@@ -61,16 +68,21 @@ void StatsThread::do_work()
                                (long long unsigned)(client_stats[i].num_loss_events));
                }
                if (fclose(fp) == EOF) {
-                       perror("fclose");
-                       unlink(filename);
+                       log_perror("fclose");
+                       if (unlink(filename) == -1) {
+                               log_perror(filename);
+                       }
                        free(filename);
                        goto sleep;
                }
                
                if (rename(filename, stats_file.c_str()) == -1) {
-                       perror("rename");
-                       unlink(filename);
+                       log_perror("rename");
+                       if (unlink(filename) == -1) {
+                               log_perror(filename);
+                       }
                }
+               free(filename);
 
 sleep:
                // Wait until the stop_fd pipe is closed, stats_interval timeout,
@@ -89,7 +101,7 @@ sleep:
                        break;
                }
                if (nfds == -1) {
-                       perror("poll");
+                       log_perror("poll");
                        usleep(100000);
                        continue;
                }