Clean unused code

diff --git a/cm160Server.py b/cm160Server.py
index 931c1dae8313c71dfeebf22fad07a8fd0e6e5e9c..01bc63392755041ac788a54ab557d641ceee68c7 100755 (executable)
--- a/cm160Server.py
+++ b/cm160Server.py
@@ -32,7 +32,7 @@ class UserOutput:
   """Responsible for user output to stdout and to log files"""
   
   def __init__(self):
-    self.__logFile = None
+    self.__logFile = "cm160Server.log"
     self.__debug   = False
     self.__fileLock = Lock()
     self.__stdoutLock = Lock()
@@ -344,9 +344,8 @@ class CM160:
   ID_MSG      = "%cIDTCMV001%c" % (MESSAGE_ID_0,1)
   WAIT_MSG    = "%cIDTWAITPCR" % (MESSAGE_ID_0)
 
-  def __init__(self, uo, serverPort, dataStore, debug):
+  def __init__(self, uo, dataStore, debug):
     self.__uo             = uo
-    self.__serverPort     = serverPort
     self.__dataStore      = dataStore
     self.__debug          = debug
 
@@ -369,11 +368,6 @@ class CM160:
     self.__queueReader = QueueReader(self.__queue, self.__dataStore, self.__uo)
     self.__queueReader.start()
       
-#    if self.__server != None:
-#      self.__server.waitStop()
-      
-#    self.__server = Server(self.__uo, self.__serverPort, self.__queueReader, self.__dataStore)
-#    self.__server.start()
     
   def __serialPortScan(self):
     """scan for available serial ports. return a list of tuples [num, name]"""
@@ -912,7 +906,6 @@ if __name__=='__main__':
     opts, args = getopt.getopt(sys.argv[1:], 'toi:l:rf:p:qds:h', ["help"])
 
     quietMode  = False
-    serverPort = CM160.DEFAULT_SERVER_PORT
     serialPort = None
     readDatabase=False
     readStartTime=datetime.datetime.min
@@ -921,11 +914,7 @@ if __name__=='__main__':
     forwardToTextFile=False
     
     for o, a in opts:
-      if o == '-f':
-        dbFile=a
-      elif o == '-p':
-        serverPort=int(a)
-      elif o == '-q':
+      if o == '-q':
         quietMode=True
       elif o == '-s':
         serialPort=int(a)
@@ -936,22 +925,13 @@ if __name__=='__main__':
           
       elif o == "-d":
         debug = True
-      elif o == "-r":
-        readDatabase = True
-      elif o == "-i":
-        readStartTime=getDateTime(a)
-      elif o == "-l":
-        readStopTime=getDateTime(a)
       elif o == "-o":
         compatMode=True
-      elif o == "-t":
-        forwardToTextFile=True
       elif o == "-h":
         usage(uo)
         sys.exit(0)
 
-    #Don't really need to log stdout, uncomment if you really need to
-    #uo.setLogFile("c:\\cm160.uo.log")
+    uo.setLogFile("cm160Server.log")
     
     if not compatMode:
       uo.info("CM160Server v %2.2f" % (VERSION) )
@@ -963,7 +943,7 @@ if __name__=='__main__':
     DataStore = MySQLDataStore()
 
 # Démarrage du collect data
-    cm160 = CM160(uo, serverPort, DataStore, debug)
+    cm160 = CM160(uo, DataStore, debug)
     
 # Connexion au serial port :
     if serialPort == None: