From d7172bc329eae49619671bcd1bd0d392fc80c8b4 Mon Sep 17 00:00:00 2001
From: Nate Coraor <nate@bx.psu.edu>
Date: Fri, 14 Mar 2008 16:49:42 +0000
Subject: [PATCH] A couple small tweaks to the monitor.

---
 cron/check_galaxy.sh    | 15 +++++++++++++++
 scripts/check_galaxy.py | 11 ++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/cron/check_galaxy.sh b/cron/check_galaxy.sh
index 6a63e7ebc68..b0fe972afbc 100755
--- a/cron/check_galaxy.sh
+++ b/cron/check_galaxy.sh
@@ -96,6 +96,21 @@ for dir in $VAR/$1 $NOTIFIED_MAIL $NOTIFIED_PAGE; do
     fi
 done
 
+if [ ! -f "$VAR/$1/login" ]; then
+    [ $DEBUG = 1 ] && cat <<EOF
+Please create the file:
+  $VAR/$1/login
+This should contain a username and password to log in to
+Galaxy with, on one line, separated by whitespace, e.g.:
+
+check_galaxy@example.com password
+
+If the user does not exist, check_galaxy will create it
+for you.
+EOF
+    exit 0
+fi
+
 if [ $STAGGER ]; then
     if [ -f "$STAGGER_FILE" ]; then
         STAGGER_COUNT=`cat $STAGGER_FILE`
diff --git a/scripts/check_galaxy.py b/scripts/check_galaxy.py
index 00e3a6e61dc..e9d0d3f268a 100755
--- a/scripts/check_galaxy.py
+++ b/scripts/check_galaxy.py
@@ -43,17 +43,18 @@ if len(sys.argv) < 2:
     print "usage: check_galaxy.py <server>"
     sys.exit(1)
 
-if sys.argv[1].find(".") < 0:
-    server = "%s.g2.bx.psu.edu" % sys.argv[1]
+server = sys.argv[1]
+if server.endswith(".g2.bx.psu.edu"):
+    if debug:
+        print "Checking a PSU Galaxy server, using maint file"
     maint = "/errordocument/502/%s/maint" % sys.argv[1]
 else:
-    server = sys.argv[1]
     maint = None
 
 # state information
 var_dir = os.path.join( home, ".check_galaxy", server )
 if not os.access( var_dir, os.F_OK ):
-    os.makedirs( var_dir )
+    os.makedirs( var_dir, 0700 )
 
 # get user/pass
 login_file = os.path.join( var_dir, "login" )
@@ -69,7 +70,7 @@ except:
     print ""
     print "If the user does not exist, check_galaxy will create it"
     print "for you."
-    sys.exit( 1 )
+    sys.exit(1)
 ( username, password ) = f.readline().split()
 
 # find/import twill