Commit 5e6b115a authored by Gary Wong's avatar Gary Wong

A bunch of monitoring fixes.

parent 6ce55e34
......@@ -204,7 +204,9 @@ LoadModule disk_cache_module libexec/apache22/mod_disk_cache.so
#LoadModule file_cache_module libexec/apache22/mod_file_cache.so
#LoadModule mem_cache_module libexec/apache22/mod_mem_cache.so
LoadModule cgi_module libexec/apache22/mod_cgi.so
<IfDefine PGENI>
LoadModule wsgi_module libexec/apache22/mod_wsgi.so
</IfDefine>
#
# The following modules are not loaded by default:
......
......@@ -60,7 +60,7 @@ shared-node-monitor: shared-node-monitor.o $(TESTBED_LIBOBJDIR)/event/libevent.a
$(CC) $(LDFLAGS) -o $@ shared-node-monitor.o $(LIBS)
shared-node-monitor.o: shared-node-monitor.c
$(CC) $(CFLAGS) -o $@ $<
$(CC) $(CFLAGS) -o $@ -c $<
else
shared-node-monitor:
endif
......@@ -77,7 +77,7 @@ client-install: client
-mkdir -p $(USRBINDIR)
$(INSTALL_PROGRAM) $(SRCDIR)/geni-get $(USRBINDIR)
ifeq ($(SYSTEM),Linux)
$(INSTALL_PROGRAM) shared-node-monitor $(DESTDIR)$CLIENT_BINDIR)/shared-node-monitor
$(INSTALL_PROGRAM) shared-node-monitor $(DESTDIR) $(CLIENT_BINDIR)/shared-node-monitor
endif
subboss:
......
......@@ -26,6 +26,7 @@ TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ..
SUBDIR = event
ISMAINSITE = @TBMAINSITE@
PROTOGENI = @PROTOGENI_SUPPORT@
include $(OBJDIR)/Makeconf
......
......@@ -53,6 +53,7 @@ LDFLAGS += -L$(TESTBED_LIBOBJDIR)
LDFLAGS += -L$(TESTBED_LIBOBJDIR)/event
LIBS = -levent -lcrypto
LIBS += -L/usr/local/lib -lpubsub -lm
LIBS += -L/usr/local/lib/mysql -lmysqlclient
LDFLAGS += $(LDSTATIC)
shared-node-listener: shared-node-listener.c
......
......@@ -24,6 +24,7 @@
#include <mysql/mysql.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include "event.h"
static MYSQL db;
......
......@@ -133,6 +133,12 @@ sub UpdateClientSide($)
return -1
if ($?);
system("sudo ssh $opts $node ".
" 'cd $eltb/$objdir/protogeni; ".
" make client-install >& /tmp/install.log'");
return -1
if ($?);
return 0;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment