Changeset 1077

Timestamp:

11/03/06 12:40:18 (7 years ago)

Author:

mglb1

Message:

Added a routine which regularly (every minute at the moment) checks the status
of the upstream connection and tries to re-establish it if there is a problem.

Fixes #87

File:

• ccsd/private/modules/ccs_monitor_rurallink.py (modified) (2 diffs)

ccsd/private/modules/ccs_monitor_rurallink.py

@@ -80 +80 @@
 # How often (seconds) to phone home 
 PHONE_HOME_INTERVAL = 60 * 30
+
+# How often to check that our upstream connection is working
+UPSTREAM_CHECK_INTERVAL = 60
 
 # Default XMLRPC server to phone home to
@@ -2968 +2971 @@
     except:
         log_error("Exception while trying to phone home!", sys.exc_info())
+
+@registerRecurring(UPSTREAM_CHECK_INTERVAL)
+def checkUpstream():
+    global int_ifname, backhaul_ifname, ext_ifname, backhaul_vbase
+    global rl_isptype
+
+    if not isMasterNode():
+        # Check that the backhaul is up
+        ifaces = {}
+        for i in getInterfaces(True): ifaces[i["name"]] = i
+        if backhaul_ifname not in ifaces.keys():
+            if checkClientInterfaces():
+                needsUp = True
+        else:
+            if not ifaces[backhaul_ifname]["up"]:
+                needsUp = True
+        if needsUp:
+            log_info("Attempting to bring backhaul interface up")
+            log_command("/sbin/ifdown %s 2>&1" % backhaul_ifname)
+            log_command("/sbin/ifup %s 2>&1" % backhaul_ifname)
+        return
+
+    # Check the various internet connection options are connected
+    gwstatus, gwtext, ispstatus, isptext, ispaction = getISPStatus()
+    if ispstatus != "ok" or gwstatus == "critical":
+        # Attempt to reconnect the ISP
+        log_info("Attempting to reconnect to the ISP")
+        ISPDisconnect()
+        ISPConnect()
 
 ##############################################################################