Changeset 9728 in genesis for tools

Timestamp:

Nov 21, 2011, 6:46:50 PM (13 years ago)

Author:

rick

Message:

Better logging and re-use of sockets to allow disconnect and re-connects.

File:

• tools/gformat.py (modified) (7 diffs)

tools/gformat.py

@@ -400 +400 @@
           ip_list.append(addr)
         else:
-          print "## IP '%s' in '%s' not valid" % (addr, config['nodename'])
+          logger.error("## IP '%s' in '%s' not valid" % (addr, config['nodename']))
     return sorted(ip_list)
 
@@ -730 +730 @@
           return True
       handler = MyCGIHTTPRequestHandler
+      SocketServer.allow_reuse_address = True
       httpd = SocketServer.TCPServer(("", PORT), handler)
       httpd.server_name = 'localhost'
       httpd.server_port = PORT
 
-      print "serving at port", PORT
+      logger.info("serving at port %s", PORT)
       try:
         httpd.serve_forever()
       except KeyboardInterrupt:
         httpd.shutdown()
+        logger.info("All done goodbye")
     elif sys.argv[1] == "test":
       os.environ['PATH_INFO'] = "/".join(sys.argv[2:])
@@ -753 +755 @@
         for config in files:
           items['config'] = config
-          print "## Generating %(node)s %(config)s" % items
+          logger.info("## Generating %(node)s %(config)s" % items)
           f = open("%(wdir)s/%(config)s" % items, "w")
           f.write(generate_config(node, config, datadump))
@@ -763 +765 @@
         sql = """INSERT IGNORE INTO nodes (name, name_ns, longitude, latitude)
         VALUES ('%(nodename)s', '%(nodename)s', %(latitude)s, %(longitude)s);""" % datadump;
-        print sql
         sql = """INSERT IGNORE INTO users_nodes (user_id, node_id, owner)
         VALUES (
@@ -769 +770 @@
           (SELECT id FROM nodes WHERE name = '%(nodename)s'),
           'Y');""" % datadump
-        print sql
         #for config in files:
         #  items['config'] = config
@@ -787 +787 @@
               VALUES ((SELECT id FROM nodes WHERE name = '%(nodename)s'), 'ap',
               '%(ssid)s', 'IEEE 802.11b', %(channel)s, 'active');""" % ifacedump
-            print sql
     elif sys.argv[1] == "full-export":
       hosts = {}
@@ -801 +800 @@
       datadumps = dict()
       for host in get_hostlist():
-        print "# Processing: ", host
+        logger.info("# Processing: %s", host)
         datadump = get_yaml(host)
         datadumps[get_fqdn(datadump)] = datadump