Removed some unused code, whitespace fixes, setup.py corrected0.0.4

Change-Id: I7daa343bd318335e889beb4d11e5da8e07dafdf7

4 files changed, 18 insertions, 27 deletions

diff --git a/etc/lavapdu/lavapdu.conf b/etc/lavapdu/lavapdu.conf
index ae8cbc5..c57ae01 100644
--- a/etc/lavapdu/lavapdu.conf
+++ b/etc/lavapdu/lavapdu.conf
@@ -6,8 +6,8 @@
         "dbuser": "pdudaemon",
         "dbpass": "pdudaemon",
         "dbname": "lavapdu",
-        "retries": 3,
-        "logging_level": "DEBUG"
+        "retries": 5,
+        "logging_level": "INFO"
     },
     "pdus": {
         "192.168.10.2": {
@@ -29,4 +29,4 @@
             "driver": "apc7952"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/lavapdu/drivers/apc9218.py b/lavapdu/drivers/apc9218.py
index 8535c85..ad10ca5 100644
--- a/lavapdu/drivers/apc9218.py
+++ b/lavapdu/drivers/apc9218.py
@@ -31,7 +31,6 @@ class APC9218(APC7952):
         return False
 
     def _port_interaction(self, command, port_number):
-        print("Attempting command: %s port: %i" % (command, port_number))
         ### make sure in main menu here
         self._back_to_main()
         self.connection.send("\r")
diff --git a/lavapdu/socketserver.py b/lavapdu/socketserver.py
index c1b8c27..b2c3ac4 100644
--- a/lavapdu/socketserver.py
+++ b/lavapdu/socketserver.py
@@ -67,8 +67,8 @@ class TCPRequestHandler(SocketServer.BaseRequestHandler):
         port = int(array[1])
         request = array[2]
         if not (request in ["reboot", "on", "off"]):
-            logging.info("Unknown request: %s" % request)
-            raise Exception("Unknown request: %s" % request)
+            logging.info("Unknown request: %s", request)
+            raise Exception("Unknown request: %s", request)
         if request == "reboot":
             logging.debug("reboot requested, submitting off/on")
             self.queue_request(hostname, port, "off", now)
@@ -81,39 +81,39 @@ class TCPRequestHandler(SocketServer.BaseRequestHandler):
                 self.queue_request(hostname, port, request, now)
 
     def queue_request(self, hostname, port, request, exectime):
-        db = DBHandler(self.server.settings)
+        dbhandler = DBHandler(self.server.settings)
         sql = "insert into pdu_queue (hostname,port,request,exectime) " \
               "values ('%s',%i,'%s',%i)" % (hostname, port, request, exectime)
-        db.do_sql(sql)
-        db.close()
-        del db
+        dbhandler.do_sql(sql)
+        dbhandler.close()
+        del dbhandler
 
 
     def handle(self):
         logging.getLogger().name = "TCPRequestHandler"
-        ip = self.client_address[0]
+        request_ip = self.client_address[0]
         try:
             data = self.request.recv(4096).strip()
             socket.setdefaulttimeout(2)
             try:
-                request_host = socket.gethostbyaddr(ip)[0]
-            except socket.herror as e:
+                request_host = socket.gethostbyaddr(request_ip)[0]
+            except socket.herror as e: #pylint: disable=invalid-name
                 #logging.debug("Unable to resolve: %s error: %s" % (ip,e))
-                request_host = ip
-            logging.info("Received a request from %s: '%s'"
-                         % (request_host, data))
+                request_host = request_ip
+            logging.info("Received a request from %s: '%s'", request_host, data)
             self.insert_request(data)
             self.request.sendall("ack\n")
-        except Exception as e:
+        except Exception as e: #pylint: disable=invalid-name
             logging.debug(e.__class__)
             logging.debug(e.message)
             self.request.sendall("nack\n")
         self.request.close()
 
+
 class TCPServer(SocketServer.ThreadingMixIn, SocketServer.TCPServer):
     allow_reuse_address = True
     daemon_threads = True
-    pass
+    #pass
 
 if __name__ == "__main__":
     logging.basicConfig(level=logging.DEBUG)
@@ -124,13 +124,5 @@ if __name__ == "__main__":
     with open(filename) as stream:
         jobdata = stream.read()
         json_data = json.loads(jobdata)
-
-    #starter = {"daemon": {"dbhost":"127.0.0.1",
-    #                      "dbuser":"pdudaemon",
-    #                      "dbpass":"pdudaemon",
-    #                     "dbname":"lavapdu",
-    #                     "logging_level": logging.DEBUG,
-    #                     "hostname": "0.0.0.0", "port": 16421}}
-    #ss = ListenerServer(starter)
     ss = ListenerServer(json_data["daemon"])
     ss.start()
diff --git a/setup.py b/setup.py
index d0d6cc2..b1b1b26 100644
--- a/setup.py
+++ b/setup.py
@@ -38,7 +38,7 @@ setup(
     data_files=[
         ("/etc/init.d/", ["etc/lavapdu-runner.init"]),
         ("/etc/init.d/", ["etc/lavapdu-listen.init"]),
-        ("/etc/", ["etc/lavapdu.conf"]),
+        ("/etc/lavapdu/", ["etc/lavapdu/lavapdu.conf"]),
         ("/etc/logrotate.d/", ["etc/lavapdulogrotate"]),
     ],
     scripts=[