Do not crash on re-exec if we do not have an access log.

[cubemap] / accesslog.cpp

diff --git a/accesslog.cpp b/accesslog.cpp
index a0467b1572603c17ea74ea2839e5408f7bdf13f5..3183a10f5f1810fa4890e43fedf5c84c7ff20801 100644 (file)
--- a/accesslog.cpp
+++ b/accesslog.cpp
@@ -1,9 +1,9 @@
+#include <errno.h>
+#include <poll.h>
+#include <stddef.h>
 #include <stdio.h>
+#include <time.h>
 #include <unistd.h>
-#include <sys/poll.h>
-#include <errno.h>
-
-#include <algorithm>
 #include <string>
 #include <vector>
 
@@ -16,12 +16,12 @@ using namespace std;
 
 AccessLogThread::AccessLogThread()
 {
-       pthread_mutex_init(&mutex);
+       pthread_mutex_init(&mutex, NULL);
 }
 
 AccessLogThread::AccessLogThread(const string &filename)
        : filename(filename) {
-       pthread_mutex_init(&mutex);
+       pthread_mutex_init(&mutex, NULL);
 }
 
 void AccessLogThread::write(const ClientStats& client)
@@ -89,9 +89,11 @@ void AccessLogThread::do_work()
                        continue;
                }
        }
-       
-       if (fclose(logfp) == EOF) {
-               log_perror("fclose");
+
+       if (logfp != NULL) {    
+               if (fclose(logfp) == EOF) {
+                       log_perror("fclose");
+               }
        }
 
        logfp = NULL;