Commit 48715151 authored by Leigh B Stoller's avatar Leigh B Stoller

New config variables for the rfmonitor.

    POWDER_RFMONITOR=0
    POWDER_RFMONITOR_HOST="0.0.0.0"

First one to enable the monitor and start in rc.d script. The second is
the local address for the daemon. On the FEs we use 10.10.10.2 which is
the alias on boss for the local network.
parent daea075c
......@@ -49,6 +49,7 @@ my $optlist = "dnp:";
my $debug = 0;
my $impotent = 0;
my $PORT = 12237;
my $HOST = "@POWDER_RFMONITOR_HOST@";
#
# Configure variables
......@@ -56,6 +57,7 @@ my $PORT = 12237;
my $TB = "@prefix@";
my $TBOPS = "@TBOPSEMAIL@";
my $MAINSITE = @TBMAINSITE@;
my $POWDER_RFMONITOR = @POWDER_RFMONITOR@;
my $LOGFILE = "$TB/log/rfmonitor_daemon.log";
my $POWER = "$TB/bin/power";
my $FORMAT = "portid,timestamp,frequency,power";
......
......@@ -677,6 +677,8 @@ TBROBOCOPSEMAIL
TBOPSEMAIL_NOSLASH
TBOPSEMAIL
UI_EXTERNAL_ACCOUNTS
POWDER_RFMONITOR
POWDER_RFMONITOR_HOST
BOOTINFO_EVENTS
REPORTBOOT_ENABLED
REPORTBOOT_FLAGS
......@@ -5287,6 +5289,8 @@ BOOTINFO_EVENTS=1
REPORTBOOT_ENABLED=0
REPORTBOOT_FLAGS=""
UI_EXTERNAL_ACCOUNTS=0
POWDER_RFMONITOR=0
POWDER_RFMONITOR_HOST="0.0.0.0"
#
# XXX You really don't want to change these!
......
......@@ -341,6 +341,8 @@ AC_SUBST(BOOTINFO_EVENTS)
AC_SUBST(REPORTBOOT_ENABLED)
AC_SUBST(REPORTBOOT_FLAGS)
AC_SUBST(UI_EXTERNAL_ACCOUNTS)
AC_SUBST(POWDER_RFMONITOR)
AC_SUBST(POWDER_RFMONITOR_HOST)
#
# Offer both versions of the email addresses that have the @ escaped
......@@ -527,6 +529,8 @@ BOOTINFO_EVENTS=1
REPORTBOOT_ENABLED=0
REPORTBOOT_FLAGS=""
UI_EXTERNAL_ACCOUNTS=0
POWDER_RFMONITOR=0
POWDER_RFMONITOR_HOST="0.0.0.0"
#
# XXX You really don't want to change these!
......
......@@ -191,6 +191,11 @@ case "$1" in
@prefix@/sbin/portal_monitor
fi
if [ "@POWDER_RFMONITOR@" == "1" -a -x @prefix@/sbin/rfmonitor_daemon ]; then
echo -n " rfmonitor_daemon"
@prefix@/sbin/rfmonitor_daemon
fi
if [ -x @prefix@/sbin/portal_resources ]; then
echo -n " portal_resources"
@prefix@/sbin/portal_resources
......@@ -343,6 +348,9 @@ case "$1" in
if [ -r /var/run/portal_monitor.pid ]; then
kill `cat /var/run/portal_monitor.pid`
fi
if [ -r /var/run/rfmonitor_daemon.pid ]; then
kill `cat /var/run/rfmonitor_daemon.pid`
fi
if [ -r /var/run/portal_resources.pid ]; then
kill `cat /var/run/portal_resources.pid`
fi
......
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