use logger in helper commands

diff --git a/sfa/client/sfiAddAttribute.py b/sfa/client/sfiAddAttribute.py
index f22e63e..6fa51b4 100755 (executable)
--- a/sfa/client/sfiAddAttribute.py
+++ b/sfa/client/sfiAddAttribute.py
@@ -1,9 +1,12 @@
 #! /usr/bin/env python
 
 import sys
+
+from sfa.util.sfalogging import logger
 from sfa.client.sfi_commands import Commands
 from sfa.rspecs.rspec import RSpec
 
+logger.enable_console()
 command = Commands(usage="%prog [options] [node1 node2...]",
                    description="Add sliver attributes to the RSpec. " +
                    "This command reads in an RSpec and outputs a modified " +
@@ -33,12 +36,12 @@ if command.opts.infile:
                 try:
                     rspec.version.add_default_sliver_attribute(name, value)
                 except:
-                    print >> sys.stderr, "FAILED: on all nodes: %s=%s" % (name, value)
+                    logger.log_exc("sfiAddAttribute FAILED on all nodes: %s=%s" % (name, value))
             else:
                 for node in nodes:
                     try:
                         rspec.version.add_sliver_attribute(node, name, value)
                     except:
-                        print >> sys.stderr, "FAILED: on node %s: %s=%s" % (node, name, value)
+                        logger.log_exc ("sfiAddAttribute FAILED on node %s: %s=%s" % (node, name, value))
 
     print rspec.toxml()

diff --git a/sfa/client/sfiAddLinks.py b/sfa/client/sfiAddLinks.py
index f5b2888..2e667b1 100755 (executable)
--- a/sfa/client/sfiAddLinks.py
+++ b/sfa/client/sfiAddLinks.py
@@ -1,10 +1,13 @@
 #! /usr/bin/env python
 
 import sys
+
+from sfa.util.sfalogging import logger
 from sfa.client.sfi_commands import Commands
 from sfa.rspecs.rspec import RSpec
 from sfa.rspecs.version_manager import VersionManager
 
+logger.enable_console()
 command = Commands(usage="%prog [options] node1 node2...",
                    description="Add links to the RSpec. " +
                    "This command reads in an RSpec and outputs a modified " +
@@ -38,8 +41,7 @@ try:
     request_rspec.version.merge(ad_rspec)
     request_rspec.version.add_link_requests(link_tuples)
 except:
-    print >> sys.stderr, "FAILED: %s" % links
-    raise
+    logger.log_exc("sfiAddLinks FAILED with links %s" % links)
     sys.exit(1)
 print >>outfile, request_rspec.toxml()
 sys.exit(0)

diff --git a/sfa/client/sfiAddSliver.py b/sfa/client/sfiAddSliver.py
index c72dee3..7e3ce2c 100755 (executable)
--- a/sfa/client/sfiAddSliver.py
+++ b/sfa/client/sfiAddSliver.py
@@ -1,10 +1,13 @@
 #! /usr/bin/env python
 
 import sys
+
+from sfa.util.sfalogging import logger
 from sfa.client.sfi_commands import Commands
 from sfa.rspecs.rspec import RSpec
 from sfa.rspecs.version_manager import VersionManager
 
+logger.enable_console()
 command = Commands(usage="%prog [options] node1 node2...",
                    description="Add slivers to the RSpec. " +
                    "This command reads in an RSpec and outputs a modified " +
@@ -37,8 +40,7 @@ try:
     request_rspec.version.merge(ad_rspec)
     request_rspec.version.add_slivers(slivers)
 except:
-    print >> sys.stderr, "FAILED: %s" % nodes
-    raise
+    logger.log_exc("sfiAddSliver failed with nodes %s" % nodes)
     sys.exit(1)
 print >>outfile, request_rspec.toxml()
 sys.exit(0)

diff --git a/sfa/client/sfiDeleteAttribute.py b/sfa/client/sfiDeleteAttribute.py
index 53b2542..7e6a5ae 100755 (executable)
--- a/sfa/client/sfiDeleteAttribute.py
+++ b/sfa/client/sfiDeleteAttribute.py
@@ -1,9 +1,12 @@
 #! /usr/bin/env python
 
 import sys
+
+from sfa.util.sfalogging import logger
 from sfa.client.sfi_commands import Commands
 from sfa.rspecs.rspec import RSpec
 
+logger.enable_console()
 command = Commands(usage="%prog [options] [node1 node2...]",
                    description="Delete sliver attributes from the RSpec. " +
                    "This command reads in an RSpec and outputs a modified " +
@@ -33,12 +36,12 @@ if command.opts.infile:
                 try:
                     rspec.version.remove_default_sliver_attribute(name, value)
                 except:
-                    print >> sys.stderr, "FAILED: on all nodes: %s=%s" % (name, value)
+                    logger.log_exc("sfiDeleteAttribute FAILED on all nodes: %s=%s" % (name, value))
             else:
                 for node in nodes:
                     try:
                         rspec.version.remove_sliver_attribute(node, name, value)
                     except:
-                        print >> sys.stderr, "FAILED: on node %s: %s=%s" % (node, name, value)
+                        logger.log_exc("sfiDeleteAttribute FAILED on node %s: %s=%s" % (node, name, value))
 
     print rspec.toxml()

diff --git a/sfa/client/sfiDeleteSliver.py b/sfa/client/sfiDeleteSliver.py
index be10f0b..3dc50e6 100755 (executable)
--- a/sfa/client/sfiDeleteSliver.py
+++ b/sfa/client/sfiDeleteSliver.py
@@ -1,9 +1,12 @@
 #! /usr/bin/env python
 
 import sys
+
+from sfa.util.sfalogging import logger
 from sfa.client.sfi_commands import Commands
 from sfa.rspecs.rspec import RSpec
 
+logger.enable_console()
 command = Commands(usage="%prog [options] node1 node2...",
                    description="Delete slivers from the RSpec. " +
                    "This command reads in an RSpec and outputs a modified " +
@@ -24,7 +27,7 @@ if command.opts.infile:
         rspec.version.remove_slivers(slivers)
         print rspec.toxml()
     except:
-        print >> sys.stderr, "FAILED: %s" % nodes 
+        logger.log_exc("sfiDeleteSliver FAILED with nodes %s" % nodes)