Changeset 1034 for trunk

Timestamp:

Oct 4, 2008, 8:13:08 PM (16 years ago)

Author:

broder

Message:

Use the syslog module instead of the event_logger module

Location:

trunk/packages/sipb-xen-dhcp

Files:

• code/dhcpserver.py (modified) (11 diffs)
• code/event_logger.py (deleted)
• debian/changelog (modified) (1 diff)

trunk/packages/sipb-xen-dhcp/code/dhcpserver.py

@@ -10 +10 @@
 import IN
 
-import event_logger
-if '__main__' == __name__:
-    event_logger.init("stdout", 'DEBUG', {})
-from event_logger import Log
+import syslog as s
 
 import psycopg2
@@ -51 +48 @@
             parts = line.split()
             if parts[1] == ipstr:
-                Log.Output(Log.debug, "find_interface found "+str(nic.ip)+" on "+parts[0])
+                s.syslog(s.LOG_DEBUG, "find_interface found "+str(nic.ip)+" on "+parts[0])
                 return parts[0]
         return
@@ -108 +105 @@
 
     def Discover(self, packet):
-        Log.Output(Log.debug,"dhcp_backend : Discover ")
+        s.syslog(s.LOG_DEBUG, "dhcp_backend : Discover ")
         chaddr = hwmac(packet.GetHardwareAddress())
         nic = self.findNIC(str(chaddr))
@@ -131 +128 @@
         if ip is not None:
             ip = ipv4(ip)
-            Log.Output(Log.debug,"dhcp_backend : Discover result = "+str(ip))
+            s.syslog(s.LOG_DEBUG,"dhcp_backend : Discover result = "+str(ip))
             packet_parameters = self.getParameters(**options)
 
@@ -142 +139 @@
         
     def Request(self, packet):
-        Log.Output(Log.debug, "dhcp_backend : Request")
+        s.syslog(s.LOG_DEBUG, "dhcp_backend : Request")
         
         discover = self.Discover(packet)
@@ -153 +150 @@
 
         if not discover:
-            Log.Output(Log.info,"Unknown MAC address: "+str(chaddr))
+            s.syslog(s.LOG_INFO,"Unknown MAC address: "+str(chaddr))
             return False
         
         if yiaddr!="0.0.0.0" and yiaddr == request :
-            Log.Output(Log.info,"Ack ip "+str(yiaddr)+" for "+str(chaddr))
+            s.syslog(s.LOG_INFO,"Ack ip "+str(yiaddr)+" for "+str(chaddr))
             return True
         else:
-            Log.Output(Log.info,"Requested ip "+str(request)+" not available for "+str(chaddr))
+            s.syslog(s.LOG_INFO,"Requested ip "+str(request)+" not available for "+str(chaddr))
         return False
 
@@ -173 +170 @@
         pydhcplib.dhcp_network.DhcpServer.__init__(self,"0.0.0.0",options["client_listen_port"],options["server_listen_port"],)
         self.backend = backend
-        Log.Output(Log.debug, "__init__ DhcpServer")
+        s.syslog(s.LOG_DEBUG, "__init__ DhcpServer")
 
     def SendDhcpPacketTo(self, To, packet):
@@ -198 +195 @@
             agent_ip = ".".join(map(str,giaddr))
             self.SendDhcpPacketTo(agent_ip,packet)
-            Log.Output(Log.debug, "SendPacket to agent : "+agent_ip)
+            s.syslog(s.LOG_DEBUG, "SendPacket to agent : "+agent_ip)
 
         # FIXME: This shouldn't broadcast if it has an IP address to send
         # it to instead. See RFC2131 part 4.1 for full details
         else :
-            Log.Output(Log.debug, "No agent, broadcast packet.")
+            s.syslog(s.LOG_DEBUG, "No agent, broadcast packet.")
             self.SendDhcpPacketTo("255.255.255.255",packet)
             
@@ -213 +210 @@
         logmsg = "Get DHCPDISCOVER packet from " + hwmac(packet.GetHardwareAddress()).str()
 
-        Log.Output(Log.info, logmsg)
+        s.syslog(s.LOG_INFO, logmsg)
         offer = DhcpPacket()
         offer.CreateDhcpOfferPacketFrom(packet)
@@ -233 +230 @@
 
         if sid != [0,0,0,0] and ciaddr == [0,0,0,0] :
-            Log.Output(Log.info, "Get DHCPREQUEST_SELECTING_STATE packet")
+            s.syslog(s.LOG_INFO, "Get DHCPREQUEST_SELECTING_STATE packet")
 
         elif sid == [0,0,0,0] and ciaddr == [0,0,0,0] and ip :
-            Log.Output(Log.info, "Get DHCPREQUEST_INITREBOOT_STATE packet")
+            s.syslog(s.LOG_INFO, "Get DHCPREQUEST_INITREBOOT_STATE packet")
 
         elif sid == [0,0,0,0] and ciaddr != [0,0,0,0] and not ip :
-            Log.Output(Log.info,"Get DHCPREQUEST_INITREBOOT_STATE packet")
-
-        else : Log.Output(Log.info,"Get DHCPREQUEST_UNKNOWN_STATE packet : not implemented")
+            s.syslog(s.LOG_INFO,"Get DHCPREQUEST_INITREBOOT_STATE packet")
+
+        else : s.syslog(s.LOG_INFO,"Get DHCPREQUEST_UNKNOWN_STATE packet : not implemented")
 
         if self.backend.Request(packet) : packet.TransformToDhcpAckPacket()
@@ -252 +249 @@
     # FIXME: These are not yet implemented.
     def HandleDhcpDecline(self, packet):
-        Log.Output(Log.info, "Get DHCPDECLINE packet")
+        s.syslog(s.LOG_INFO, "Get DHCPDECLINE packet")
         self.backend.Decline(packet)
         
     def HandleDhcpRelease(self, packet):
-        Log.Output(Log.info,"Get DHCPRELEASE packet")
+        s.syslog(s.LOG_INFO,"Get DHCPRELEASE packet")
         self.backend.Release(packet)
         
     def HandleDhcpInform(self, packet):
-        Log.Output(Log.info, "Get DHCPINFORM packet")
+        s.syslog(s.LOG_INFO, "Get DHCPINFORM packet")
 
         if self.backend.Request(packet) :

trunk/packages/sipb-xen-dhcp/debian/changelog

@@ -2 +2 @@
 
   * invirt-configurize dhcp
+  * Use the syslog instead of the event_logger module
 
- -- Evan Broder <broder@mit.edu>  Sat, 04 Oct 2008 19:55:49 -0400
+ -- Evan Broder <broder@mit.edu>  Sat, 04 Oct 2008 20:08:29 -0400
 
 sipb-xen-dhcp (2) unstable; urgency=low