All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

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

Rename old portal_daemon to peer_daemon.

parent e18b4f0c
......@@ -197,7 +197,7 @@ if ($cmd ne "addpeer") {
#
# All operations other then xlogin require locking to avoid a
# race with the portal_daemon.
# race with the peer_daemon.
#
if ($cmd ne "xlogin" && !$fromdaemon) {
while (TBScriptLock("portal_op", 0, 5) != TBSCRIPTLOCK_OKAY()) {
......
......@@ -136,9 +136,9 @@ case "$1" in
@prefix@/sbin/checknodes_daemon
fi
if [ -x @prefix@/sbin/portal_daemon ]; then
echo -n " portal_daemon"
@prefix@/sbin/portal_daemon
if [ -x @prefix@/sbin/peer_daemon ]; then
echo -n " peer_daemon"
@prefix@/sbin/peer_daemon
fi
if [ -x @prefix@/sbin/poolmonitor ]; then
......@@ -312,8 +312,8 @@ case "$1" in
if [ -r /var/run/batch_daemon_wrapper.pid ]; then
kill `cat /var/run/batch_daemon_wrapper.pid`
fi
if [ -r /var/run/portal_daemon.pid ]; then
kill `cat /var/run/portal_daemon.pid`
if [ -r /var/run/peer_daemon.pid ]; then
kill `cat /var/run/peer_daemon.pid`
fi
if [ -r /var/run/poolmonitor.pid ]; then
kill `cat /var/run/poolmonitor.pid`
......
......@@ -29,7 +29,7 @@ UNIFIED = @UNIFIED_BOSS_AND_OPS@
PLABSUPPORT = @PLABSUPPORT@
ISMAINSITE = @TBMAINSITE@
NSVERIFY = @NSVERIFY@
PORTAL_ISPRIMARY= @PORTAL_ISPRIMARY@
PEER_ISPRIMARY = @PEER_ISPRIMARY@
SYSTEM := $(shell uname -s)
include $(OBJDIR)/Makeconf
......@@ -75,8 +75,8 @@ SBIN_STUFF = resetvlans console_setup.proxy sched_reload named_setup \
ifeq ($(ISMAINSITE),1)
SBIN_STUFF += repos_daemon
endif
ifeq ($(PORTAL_ISPRIMARY),1)
SBIN_STUFF += portal_daemon
ifeq ($(PEER_ISPRIMARY),1)
SBIN_STUFF += peer_daemon
endif
CTRLSBIN_STUFF = console_setup.proxy sfskey_update.proxy \
......
......@@ -30,7 +30,7 @@ use Getopt::Std;
#
sub usage()
{
print "Usage: portal_daemon [-d]\n";
print "Usage: peer_daemon [-d]\n";
exit(1);
}
my $optlist = "dn1";
......@@ -44,8 +44,8 @@ my $oneshot = 0;
my $TB = "@prefix@";
my $TBOPS = "@TBOPSEMAIL@";
my $TBLOGS = "@TBLOGSEMAIL@";
my $LOGFILE = "$TB/log/portal_daemon.log";
my $PIDFILE = "/var/run/portal_daemon.pid";
my $LOGFILE = "$TB/log/peer_daemon.log";
my $PIDFILE = "/var/run/peer_daemon.pid";
my $SUDO = "/usr/local/bin/sudo";
my $PROTOUSER = "elabman";
my $WAP = "$TB/sbin/withadminprivs";
......@@ -109,8 +109,8 @@ use User;
#
# Only one please.
#
if (CheckDaemonRunning("portal_daemon")) {
fatal("Not starting another portal daemon!");
if (CheckDaemonRunning("peer_daemon")) {
fatal("Not starting another peer daemon!");
}
#
......@@ -131,10 +131,10 @@ if (! $debug) {
exit(0);
}
}
if (MarkDaemonRunning("portal_daemon")) {
if (MarkDaemonRunning("peer_daemon")) {
fatal("Could not mark daemon as running!");
}
logit("Portal Daemon starting ... pid $$");
logit("Peer Daemon starting ... pid $$");
if ($elabman->FlipTo($protoproj->unix_gid())) {
fatal("Could not flipto $elabman");
......@@ -403,11 +403,11 @@ sub fatal($)
# Send a message to the testbed list.
#
SENDMAIL($TBOPS,
"Portal Daemon died",
"Peer Daemon died",
$msg,
$TBOPS);
MarkDaemonStopped("portal_daemon");
MarkDaemonStopped("peer_daemon");
die("*** $0:\n".
" $msg\n");
......@@ -426,7 +426,7 @@ sub notify($)
my ($msg) = @_;
logit("$msg");
SENDMAIL($TBOPS, "Portal Daemon Message",
"Portal Daemon Message:\n\n$msg", $TBOPS);
SENDMAIL($TBOPS, "Peer Daemon Message",
"Peer Daemon Message:\n\n$msg", $TBOPS);
}
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