- Nuevo nivel de logging CRITICAL (L_CRI) para concordar con python.

- Mínimo cambio en el formato de logging.
- Cambio de sección de configuración de DB_DataObject a DBO.

diff --git a/doc/sercom.ini b/doc/sercom.ini
index 09f8e9ae4865b63551ea0bfe874ea5d147c101eb..c1d5946cb90aed3bc76e3f3312ef5d6116d2a17e 100644 (file)
--- a/doc/sercom.ini
+++ b/doc/sercom.ini
@@ -3,7 +3,7 @@
 [general]
 ; Nivel de reporte de errores.
 error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR
 [general]
 ; Nivel de reporte de errores.
 error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR

-; Nivel de loggeo: L_NON, L_ERR, L_WRN, L_INF, L_DBG, L_ALL
+; Nivel de loggeo: L_NON, L_CRI, L_ERR, L_WRN, L_INF, L_DBG, L_ALL

 ; (ver T/logconstants.php)
 loglevel = L_ALL & ~L_DBG
 ; Archivo de log (si no se especifica, se usa STDERR)
 ; (ver T/logconstants.php)
 loglevel = L_ALL & ~L_DBG
 ; Archivo de log (si no se especifica, se usa STDERR)


@@ -55,7 +55,7 @@ protocol = imap
 options  = novalidate-cert/ssl
 
 
 options  = novalidate-cert/ssl
 
 

-[DB_DataObject]
+[DBO]

 database = sqlite:////var/lib/sercom/corrector.sqlite
 schema_location = T/DBO/schema/
 class_location = T/DBO/
 database = sqlite:////var/lib/sercom/corrector.sqlite
 schema_location = T/DBO/schema/
 class_location = T/DBO/

diff --git a/src/T/general.php b/src/T/general.php
index d2abd94c605b296b48e8aea567a1d1bab61002b8..5121354efeeca2dc52ee600d4c544708ba02ec43 100644 (file)
--- a/src/T/general.php
+++ b/src/T/general.php
@@ -29,7 +29,7 @@ $DBO_options = &PEAR::getStaticProperty('DB_DataObject', 'options');
 
 // because PEAR::getstaticProperty was called with and & (get by reference)
 // this will actually set the variable inside that method (a quasi static variable)
 
 // because PEAR::getstaticProperty was called with and & (get by reference)
 // this will actually set the variable inside that method (a quasi static variable)

-$DBO_options = $CONF['DB_DataObject'];
+$DBO_options = $CONF['DBO'];

 
 //unset($DBO_options);
 
 
 //unset($DBO_options);
 

diff --git a/src/T/log.php b/src/T/log.php
new file mode 100644 (file)
index 0000000..151b909
--- /dev/null
+++ b/src/T/log.php
@@ -0,0 +1,42 @@
+<?php // vim: set binary noeol et sw=4 sts=4:
+
+function logserr($str, $level = L_ERR) {
+    global $php_errormsg;
+    logs("$str ($php_errormsg)", $level);
+}
+
+function logs($str, $level = L_INF) {
+    global $LOGLEVEL, $LOGFP, $argv;
+    if ($str and $LOGLEVEL & $level) {
+        fputs($LOGFP, sprintf("%s %s[%d] %-8s %s\n", strftime('%c'),
+                basename($argv[0]), getmypid(), loglevel2str($level), $str));
+    }
+}
+
+function loglevel2str($level) {
+    $ret = array();
+    if ($level & L_CRI) {
+        $ret[] = 'CRITICAL';
+    }
+    if ($level & L_ERR) {
+        $ret[] = 'ERROR';
+    }
+    if ($level & L_WRN) {
+        $ret[] = 'WARNING';
+    }
+    if ($level & L_INF) {
+        $ret[] = 'INFO';
+    }
+    if ($level & L_DBG) {
+        $ret[] = 'DEBUG';
+    }
+    if (count($ret) == 1) {
+        return reset($ret);
+    }
+    if ($ret) {
+        return '['.join(',', $ret).']';
+    }
+    return '';
+}
+
+?>
\ No newline at end of file

diff --git a/src/T/logconstants.php b/src/T/logconstants.php
new file mode 100644 (file)
index 0000000..ba1706f
--- /dev/null
+++ b/src/T/logconstants.php
@@ -0,0 +1,12 @@
+<?php // vim: set binary noeol et sw=4 sts=4:
+
+define('L_NON', 0);
+define('L_CRI', 1);
+define('L_ERR', 1 << 1);
+define('L_WRN', 1 << 2);
+define('L_INF', 1 << 3);
+define('L_DBG', 1 << 4 );
+define('L_ALL', 0xFFFF);
+#define('L_', );
+
+?>
\ No newline at end of file