Merge pull request #61 from TACC/master

merge this
TACC · Sep 19, 2024 · de70676 · de70676
2 parents bafc819 + 95c731b
commit de70676
Show file tree

Hide file tree

Showing 6 changed files with 331 additions and 95 deletions.
diff --git a/monitor/src/daemonize.c b/monitor/src/daemonize.c
@@ -1,4 +1,4 @@
-#include "daemonize.h"
+//#include "daemonize.h"
 #include <fcntl.h>
 #include <string.h>
 #include <stdio.h>
@@ -8,6 +8,10 @@
 
 #include <syslog.h>
 
+
+int pid_fd;
+char *pid_file_name;
+
 void daemonize()
 {
   pid_t pid = 0;

diff --git a/monitor/src/daemonize.h b/monitor/src/daemonize.h
@@ -3,8 +3,8 @@
 
 #include <stdlib.h>
 
-int pid_fd;
-char *pid_file_name;
+extern int pid_fd;
+extern char *pid_file_name;
 void daemonize();
 
 #endif
diff --git a/monitor/src/monitor.c b/monitor/src/monitor.c
@@ -29,7 +29,7 @@ static char *server = NULL;
 static char *queue  = "default";
 static char *port   = "5672";
 
-static char dumpfile_dir[] = "/tmp/taccstats";
+static char *dumpfile_dir = "/tmp/taccstats";
 static double freq = 300;
 static int max_buffer_size = 300; // 25 hours
 static int allow_ring_buffer_overwrite = 0;

diff --git a/setup.py b/setup.py
@@ -48,7 +48,7 @@
     package_data = {'tacc_stats' : ['cfg.py']},
     include_package_data = True,
     scripts = scripts,
-    install_requires = ['argparse','numpy', 'psycopg2-binary', 'pandas',
+    install_requires = ['argparse','numpy', 'psycopg2-binary', 'pandas', 'pgcopy',
                         'bokeh', 'django', 'python-hostlist', 'PyMySQL', 'mod_wsgi',
                         'mysql-connector-python', 'python-memcached', 'pika', 'mysqlclient'],
     platforms = 'any',