expose command exceptions within emane and mobility

daemon/core/emane/emanemanager.py

@@ -784,13 +784,9 @@ class EmaneManager(ConfigurableManager):
 
     def buildtransportxml(self):
         """
-        Calls emanegentransportxml using a platform.xml file to build
+        Calls emanegentransportxml using a platform.xml file to build the transportdaemon*.xml.
-        the transportdaemon*.xml.
         """
-        try:
         utils.check_cmd(["emanegentransportxml", "platform.xml"], cwd=self.session.session_dir)
-        except subprocess.CalledProcessError:
-            logger.exception("error running emanegentransportxml")
 
     def buildeventservicexml(self):
         """
@@ -844,26 +840,21 @@ class EmaneManager(ConfigurableManager):
         emanecmd = ["emane", "-d", "--logl", loglevel, "-f", os.path.join(path, "emane.log")]
         if realtime:
             emanecmd += "-r",
-        try:
+
         args = emanecmd + [os.path.join(path, "platform.xml")]
         logger.info("Emane.startdaemons() running %s" % str(args))
         utils.check_cmd(args, cwd=path)
-        except subprocess.CalledProcessError:
-            logger.exception("error starting emane")
 
         # start one transport daemon per transportdaemon*.xml file
         args = ["emanetransportd", "-d", "--logl", loglevel, "-f", os.path.join(path, "emanetransportd.log")]
         if realtime:
             args += "-r",
         files = os.listdir(path)
-        for file in files:
+        for current_file in files:
-            if file[-3:] == "xml" and file[:15] == "transportdaemon":
+            if current_file[-3:] == "xml" and current_file[:15] == "transportdaemon":
-                args = args + [os.path.join(path, file)]
+                args = args + [os.path.join(path, current_file)]
-                try:
                 logger.info("Emane.startdaemons() running %s" % str(args))
                 utils.check_cmd(args, cwd=path)
-                except subprocess.CalledProcessError:
-                    logger.exception("error starting emanetransportd")
 
     def startdaemons2(self):
         """
@@ -911,39 +902,28 @@ class EmaneManager(ConfigurableManager):
 
             # multicast route is needed for OTA data
             args = [constants.IP_BIN, "route", "add", otagroup, "dev", otadev]
-            try:
             node.check_cmd(args)
-            except subprocess.CalledProcessError:
-                logger.exception("error adding route for OTA data")
 
             # multicast route is also needed for event data if on control network
             if eventservicenetidx >= 0 and eventgroup != otagroup:
                 args = [constants.IP_BIN, "route", "add", eventgroup, "dev", eventdev]
-                try:
                 node.check_cmd(args)
-                except subprocess.CalledProcessError:
-                    logger.exception("error adding route for event data")
 
-            try:
+            # start emane
             args = emanecmd + ["-f", os.path.join(path, "emane%d.log" % n),
                                os.path.join(path, "platform%d.xml" % n)]
             logger.info("Emane.startdaemons2() running %s", args)
             output = node.check_cmd(args)
             logger.info("Emane.startdaemons2() output: %s", output)
-            except subprocess.CalledProcessError:
-                logger.exception("error starting emane")
 
         if not run_emane_on_host:
             return
 
         path = self.session.session_dir
-        try:
         emanecmd += ["-f", os.path.join(path, "emane.log")]
         args = emanecmd + [os.path.join(path, "platform.xml")]
         logger.info("Emane.startdaemons2() running %s" % args)
         utils.check_cmd(args, cwd=path)
-        except subprocess.CalledProcessError:
-            logger.exception("error starting emane")
 
     def stopdaemons(self):
         """
@@ -1164,17 +1144,10 @@ class EmaneManager(ConfigurableManager):
         is running, False otherwise.
         """
         args = ["pkill", "-0", "-x", "emane"]
-
-        status = -1
-        try:
         if emane.VERSION < emane.EMANE092:
-                utils.check_cmd(args)
+            status = utils.cmd(args)
         else:
-                node.check_cmd(args)
+            status = node.cmd(args)
-            status = 0
-        except subprocess.CalledProcessError:
-            logger.exception("error checking if emane is running")
-
         return status == 0
 
 

daemon/core/mobility.py

@@ -5,7 +5,6 @@ mobility.py: mobility helpers for moving nodes and calculating wireless range.
 import heapq
 import math
 import os
-import subprocess
 import threading
 import time
 
@@ -1238,8 +1237,5 @@ class Ns2ScriptedMobility(WayPointMobility):
         if filename is None or filename == '':
             return
         filename = self.findfile(filename)
-        try:
         args = ["/bin/sh", filename, typestr]
         utils.check_cmd(args, cwd=self.session.sessiondir, env=self.session.get_environment())
-        except subprocess.CalledProcessError:
-            logger.exception("Error running script '%s' for WLAN state %s", filename, typestr)

daemon/core/session.py

@@ -529,7 +529,7 @@ class Session(object):
             try:
                 utils.load_config(environment_user_file, env)
             except IOError:
-                logger.warn("error reading user core environment settings file: %s", environment_user_file)
+                logger.info("error reading user core environment settings file: %s", environment_user_file)
 
         return env