Changeset 614

Timestamp:

01/16/07 22:34:34 (2 years ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/contrib/05to06.py (modified) (5 diffs)

cherokee/trunk/ChangeLog

@@ +1 @@
+2007-01-16  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * contrib/05to06.py (Syntax._process_entry_guts): Allow from
+        should accept str and list. Fixed.
+
+        * contrib/05to06.py: Upodated to work with the latest logger
+        related changes.
+
-2007-01-16  A.D.F  <adefacc@tin.it>
-

cherokee/trunk/contrib/05to06.py

@@ -166 +166 @@
-
-            kind, val_ip = self._lex.get_token()
-kind != 'str'
+not kind in ['str', 'list']
-
-            print '%s!allow_from = %s' % (prefix, val_ip)
@@ -260 +260 @@
-            if kind != 'str': raise "Malformed Log"
-
+            val1 = val1.lower()
+
+            if val1.startswith('access'):
+                entry = 'access'
+            elif val1.startswith('error'):
+                entry = 'error'
+            else:
+                raise "Unknown Log entry " + val1
+
-            kind, val2 = self._lex.get_token()
-            if kind != 'path': raise "Malformed Log"
-
-val1_low = val1.lower()
-if val1_low in self.similar_entries:
-val1 = self.similar_entries[val1_low]
-
-print "%s!%s = %s" % (prefix, val1, val2
+
+if val2[0] == '/' or val2[1:2] == ':\\':
+    print "%s!%s!type = file" % (prefix, entry)
+print "%s!%s!filename = %s" % (prefix, entry, val2)
+
+    print "%s!%s!type = syslog" % (prefix, entry
-
-    def _process_icons_content (self):
@@ -431 +440 @@
-            if kind != '}': raise "Malformed ErrorHandler"
-
+        elif kind == 'log':
+            kind, log_val = self._lex.get_token()
+            if kind != 'str': raise "Malformed Log"
+            
+            kind, val = self._lex.get_token()
+            if kind != '{':
+                self._lex.rewind()
+                return True
+
+            prefix = 'vserver!%s!logger' % (vserver)
+            print "%s = %s" % (prefix, log_val)
+            self._process_log (prefix)
+
+            kind, val = self._lex.get_token()
+            if kind != '}': raise "Malformed Log"
+
-        else:
-            self._lex.rewind()            
@@ -436 +461 @@
-
-        return True
-    
-
-    def _process_server_content (self):
@@ -476 +500 @@
-            kind, val = self._lex.get_token()
-            if kind != '}': raise "Malformed encoder"
-
-        elif kind == 'log':
-            kind, log_val = self._lex.get_token()
-            if kind != 'str': raise "Malformed Log"
-            
-            kind, val = self._lex.get_token()
-            if kind != '{':
-                self._lex.rewind()
-                return True
-
-            prefix = 'server!log!%s' % (log_val)
-            self._process_log (prefix)
-
-            kind, val = self._lex.get_token()
-            if kind != '}': raise "Malformed Log"
-
-        elif kind == 'server':