Changeset 1504:83638760290c

Timestamp:

03/09/10 21:16:01 (5 months ago)

Author:

Fritz

Branch:

default

Message:

REST : start replacing print by logging feature. Move /account/user/auth to /account/auth

Files:

• src/domogik/xpl/bin/rest.py (modified) (36 diffs)

src/domogik/xpl/bin/rest.py

@@ -88 +88 @@
         self._log.info("Rest Server initialisation...")
         self._log.debug("locale : %s %s" % locale.getdefaultlocale())
+        # logging data manipulation initialization
+        log_dm = logger.Logger('REST-DM')
+        self._log_dm = log_dm.get_logger()
+        self._log_dm.info("#Rest Server Data Manipulation...")
+        self._log_dm.debug("locale : %s %s" % locale.getdefaultlocale())
         # DB Helper
         self._db = DbHelper()
@@ -110 +115 @@
             self.server_ip = server_ip
             self.server_port = server_port
+        self._log.info("Configuration : ip:port = %s:%s" % (self.server_ip, self.server_port))
 
 
         # Queues config
+        self._log.debug("Get queues configuration")
         self._config = Query(self._myxpl)
         res = xPLResult()
@@ -142 +149 @@
 
         # define listeners for queues
+        self._log.debug("Create listeners")
         Listener(self._add_to_queue_system_list, self._myxpl, \
                  {'schema': 'domogik.system',
@@ -163 +171 @@
                   'host' : gethostname()})
 
+        self._log.info("Initialisation OK")
+
 
     def _add_to_queue_system_list(self, message):
@@ -189 +199 @@
             @param nb_rec : internal parameter (do not use it for first call). Used to check recursivity VS queue size
         """
+        self._log.debug("Get from queue : %s (recursivity deepth : %s)" % (str(my_queue), nb_rec))
         # check if recursivity doesn't exceed queue size
         if nb_rec > self._queue_size:
-            print "_get_from_queue : number of call exceed queue size (%s) : return None" % self._queue_size
+            self._log.warning("Get from queue %s : number of call exceed queue size (%s) : return None" % (str(my_queue), self._queue_size))
             # we raise an "Empty" exception because we consider that if we don't find
             # the good data, it is as if it was "empty"
@@ -202 +213 @@
             # no filter defined
             if filter == None: 
+                self._log.debug("Get from queue %s : return %s" % (str(my_queue), str(message)))
                 return message
 
@@ -214 +226 @@
                         len_data = len(filter_data) - 1
                         if msg_data[0:len_data] != filter_data[0:-1]:
-                            print "Bad data!"
                             keep_data = False
                     # normal search
                     else:
                         if message.data[key] != filter[key]:
-                            print "Bad data!"
                             keep_data = False
 
                 # if message is ok for us, return it
                 if keep_data == True:
+                    self._log.debug("Get from queue %s : return %s" % (str(my_queue), str(message)))
                     return message
 
                 # else, message get back in queue and get another one
                 else:
+                    self._log.debug("Get from queue %s : bad data, check another one..." % (str(my_queue)))
                     self._put_in_queue(my_queue, message)
                     return self._get_from_queue(my_queue, filter, nb_rec + 1)
@@ -233 +245 @@
         # if message too old : get an other message
         else:
+            self._log.debug("Get from queue %s : data too old, check another one..." % (str(my_queue)))
             return self._get_from_queue(my_queue, filter, nb_rec + 1)
 
     def _put_in_queue(self, my_queue, message):
+        self._log.debug("Put in queue %s : %s" % (str(my_queue), str(message)))
         my_queue.put((time.time(), message), True, self._queue_timeout) 
 
@@ -244 +258 @@
         """
         # Start HTTP server
+        self._log.info("Start HTTP Server on %s:%s..." % (self.server_ip, self.server_port))
         server = HTTPServerWithParam((self.server_ip, int(self.server_port)), RestHandler, \
                                      handler_params = [self])
-        print 'Start REST server on %s:%s...' % (self.server_ip, self.server_port)
         server.serve_forever()
 
@@ -286 +300 @@
             Call directly .do_for_all_methods()
         """
-        print "==== GET ============================================"
         self.do_for_all_methods()
 
@@ -293 +306 @@
             Call directly .do_for_all_methods()
         """
-        print "==== POST ==========================================="
         self.do_for_all_methods()
 
@@ -300 +312 @@
             Call directly .do_for_all_methods()
         """
-        print "==== OPTIONS ==========================================="
         self.do_for_all_methods()
 
@@ -307 +318 @@
             the REST url
         """
-
         # dirty issue to force HTTP/1.1 
         self.protocol_version = 'HTTP/1.1'
         self.request_version = 'HTTP/1.1'
 
-
+        # TODO : create a thread here
         request = ProcessRequest(self.server.handler_params, self.path, \
                                  self.send_http_response_ok, \
                                  self.send_http_response_error)
         request.do_for_all_methods()
+        
 
 
@@ -331 +342 @@
             @param data : json data to display
         """
+        # TODO : log!!
+        #self._log.debug("Send HTTP header for OK")
         self.send_response(200)
         self.send_header('Content-type',  'application/json')
@@ -338 +351 @@
         self.end_headers()
         if data:
+            # TODO : log!!
+            #self._log.debug("Send HTTP data : %s" % data.encode("utf-8"))
             self.wfile.write(data.encode("utf-8"))
 
@@ -352 +367 @@
                               in jsonp format
         """
+        # TODO : log!!
+        #self._log.debug("Send HTTP header for ERROR : code=%s ; msg=%s" % (err_code, err_msg))
         self.send_response(200)
         self.send_header('Content-type',    'text/html')
@@ -358 +375 @@
         json_data.set_jsonp(jsonp, jsonp_cb)
         self.wfile.write(json_data.get())
+        # TODO : log!!
+        #self._log.warning("Error reply : %s" % json_data.get())
 
 
@@ -395 +414 @@
         self._xml_directory = self.handler_params[0]._xml_directory
 
+        self._log.debug("Process request : init")
+
         self._queue_timeout =  self.handler_params[0]._queue_timeout
         self._queue_size =  self.handler_params[0]._queue_size
@@ -412 +433 @@
 
         # url processing
-        print type(self.path).__name__
         print self.path
-        #self.path = str(urllib.unquote(self.path))
         self.path = urllib.unquote(unicode(self.path))
-        print type(self.path).__name__
-        print self.path
-        #self.path = unicode(self.path, "utf-8")
+        self._log.info("Request : %s" % self.path)
+
+        # TODO log data manipulation here
 
         tab_url = self.path.split("?")
@@ -428 +447 @@
         if self.path[-1:] == "/":
             self.path = self.path[0:len(self.path)-1]
-        print "PATH : " + self.path
         tab_path = self.path.split("/")
 
@@ -441 +459 @@
         else:
             self.rest_request = []
-        print "TYPE    : " + self.rest_type
-        print "Request : " + str(self.rest_request)
-
-
-
-
-
 
 
@@ -477 +488 @@
         """ Process parameters : ...?param1=val1&param2=val2&....
         """
+        self._log.debug("Parse request options")
 
         # for each debug option
@@ -490 +502 @@
             # call json specific options
             if opt_key == "callback" and opt_value != None:
+                self._log.debug("Option : jsonp mode")
                 self.jsonp = True
                 self.jsonp_cb = opt_value
@@ -502 +515 @@
         """ Sleep process for 15 seconds
         """
-        print "DEBUG : start sleeping for " + str(duration)
+        self._log.debug("Start sleeping for " + str(duration))
         time.sleep(float(duration))
-        print "DEBUG : end sleeping"
+        self._log.debug("End sleeping")
 
 
@@ -521 +534 @@
         json_data.add_data(("Version : 0.1.x", "Status : UP"))
         self.send_http_response_ok(json_data.get())
-
-
-
-
 
 
@@ -538 +547 @@
            - send appropriate xPL message on network
         """
-        print "Call rest_command"
+        self._log.debug("Process command")
 
         # parse data in URL
@@ -554 +563 @@
             self.send_http_response_ok(json_data.get())
             return
-        print "Techno    : %s" % techno
-        print "Address   : %s" % address
-        print "Order     : %s" % order
-        print "Others    : %s" % str(others)
+        self._log.debug("Techno    : %s" % techno)
+        self._log.debug("Address   : %s" % address)
+        self._log.debug("Order     : %s" % order)
+        self._log.debug("Others    : %s" % str(others))
 
         # open xml file
@@ -567 +576 @@
             return
 
-        print "Send message : %s" % message
+        self._log.debug("Process command > send message : %s" % str(message))
         self._myxpl.send(message)
 
@@ -576 +585 @@
 
         
-
-
-
 
 
@@ -704 +710 @@
             - Send message
         """
-
-        print "Call rest_xpl_cmnd"
+        self._log.debug("Send xpl message")
+
         if len(self.rest_request) == 0:
             self.send_http_response_error(999, "Schema not given", self.jsonp, self.jsonp_cb)
@@ -740 +746 @@
             return
 
-        print "Send message : %s" % message
+        self._log.debug("Send message : %s" % str(message))
         self._myxpl.send(message)
 
@@ -760 +766 @@
             - call the good fonction to get data from database
         """
-        print "Call rest_base_get"
+        self._log.debug("Process base request")
         # parameters initialisation
         self.parameters = {}
@@ -1328 +1334 @@
         month = int(date[4:6])
         day = int(date[6:8])
-        my_date = datetime.date(year, month, day)
+        try:
+            my_date = datetime.date(year, month, day)
+        except:
+            self.send_http_response_error(999, str(sys.exc_info()[1].replace('"', "'")), self.jsonp, self.jsonp_cb)
         return my_date
 
 
 
-
+### TODO j'en suis ici pour les _log !!
 
 ######
@@ -2346 +2355 @@
         self.parameters = {}
 
+        ### auth #####################################
+        if self.rest_request[0] == "auth":
+            if len(self.rest_request) == 3:
+                self._rest_account_auth(self.rest_request[1], self.rest_request[2])
+            else:
+                self.send_http_response_error(999, "Wrong syntax for " + self.rest_request[0], \
+                                                  self.jsonp, self.jsonp_cb)
+                return
+    
         ### user #####################################
         if self.rest_request[0] == "user":
@@ -2362 +2380 @@
                         self.send_http_response_error(999, "Wrong syntax for " + self.rest_request[1], \
                                                   self.jsonp, self.jsonp_cb)
-    
-    
-            ### auth
-            elif self.rest_request[1] == "auth":
-                if len(self.rest_request) == 4:
-                    self._rest_account_auth(self.rest_request[2], self.rest_request[3])
-                else:
-                    self.send_http_response_error(999, "Wrong syntax for " + self.rest_request[1], \
-                                                      self.jsonp, self.jsonp_cb)
-                    return
     
             ### add
@@ -2390 +2398 @@
     
             ### password
-            elif self.res2_request[1] == "password":
+            elif self.rest_request[1] == "password":
                 offset = 2
                 if self.set_parameters(offset):