Changeset 288

Timestamp:

06/03/10 10:07:57 (20 months ago)

Author:

ol

Message:

Add ows_log function and error level. Propagation of ows_log calls

Location:

trunk/src

Files:

• ows/ows.c (modified) (4 diffs)
• ows/ows_error.c (modified) (1 diff)
• ows_api.h (modified) (1 diff)
• wfs/wfs_error.c (modified) (2 diffs)

trunk/src/ows/ows.c

@@ -249 +249 @@
 
 
+void ows_log(ows *o, int log_level, const char *log)
+{
+    if (!o->log) return;
+
+    if      (log_level == 1) fprintf(o->log, "[ERROR] %s\n", log);
+    else if (log_level == 2) fprintf(o->log, "[EVENT] %s\n", log);
+    else if (log_level == 3) fprintf(o->log, "[QUERY] %s\n", log);
+    else if (log_level == 4) fprintf(o->log, "[DEBUG] %s\n", log);
+}
+
+
 void ows_usage(ows * o)
 {
@@ -323 +334 @@
         o->log = fopen(o->log_file->buf, "a");
 
-    if (!o->exit && o->log) fprintf(o->log, "== TINYOWS STARTUP == \n");
+    if (!o->exit) ows_log(o, 2, "== TINYOWS STARTUP ==");
 
     /* Connect the ows to the database */
     if (!o->exit) ows_pg(o, o->pg_dsn->buf);
-    if (!o->exit && o->log) fprintf(o->log, "== Connection PostGIS == \n");
+    if (!o->exit) ows_log(o, 2, "== Connection PostGIS ==");
 
     /* Fill layers storage metadata */
     if (!o->exit) ows_layers_storage_fill(o);
-    if (!o->exit && o->log) fprintf(o->log, "== Filling Storage == \n");
+    if (!o->exit) ows_log(o, 2, "== Filling Storage ==");
 
 
 
 #if TINYOWS_FCGI
-   if (o->log) fprintf(o->log, "== FCGI START == \n");
+   if (!o->exit) ows_log(o, 2, "== FCGI START ==");
    while (FCGI_Accept() >= 0)
    {
@@ -345 +356 @@
 
     /* Log input query if asked */
-   if (o->log && query)
-        fprintf(o->log, "[QUERY]\n%s\n", query);
+    if (!o->exit) ows_log(o, 3, query);
 
     if (query == NULL || strlen(query) == 0) {
@@ -418 +428 @@
     }
     
-    if (o->log) fprintf(o->log, "---\n"); 
+    if (cgi_method_post() && query) free(query);  /* We allocated memory only on post case */
+    ows_log(o, 2, "== End QUERY =="); 
 #if TINYOWS_FCGI
     o->exit = false;
-    if (o->log) fprintf(o->log, "== FCGI SHUTDOWN == \n");
-    }
+    }
+    ows_log(o, 2, "== FCGI SHUTDOWN ==");
     OS_LibShutdown();
 #endif
-    if (o->log) fprintf(o->log, "== TINYOWS SHUTDOWN == \n");
+    ows_log(o, 2, "== TINYOWS SHUTDOWN ==");
     if (o->log) fclose (o->log);
     ows_free(o);

trunk/src/ows/ows_error.c

@@ -78 +78 @@
     o->exit = true;
 
-    if (o->log != NULL)
-        fprintf(o->log, "[ERROR] {%s:%s} %s\n",
-        ows_error_code_string(code), locator, message);
+    ows_log(o, 1, message);
 
     fprintf(o->output, "Content-Type: application/xml\n\n");

trunk/src/ows_api.h

@@ -200 +200 @@
 void ows_layers_storage_fill(ows * o);
 void ows_layers_storage_flush(ows * o, FILE * output);
+void ows_log(ows *o, int log_level, const char *log);

trunk/src/wfs/wfs_error.c

@@ -71 +71 @@
     o->exit = true;
 
-    if (o->log != NULL)
-        fprintf(o->log, "[ERROR] {%s:%s} %s\n",
-        wfs_error_code_string(code), locator, message);
+    ows_log(o, 1, message);
 
     fprintf(o->output, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
@@ -103 +101 @@
     o->exit = true;
 
-    if (o->log != NULL)
-        fprintf(o->log, "[ERROR] {%s:%s} %s\n",
-        wfs_error_code_string(code), locator, message);
+    ows_log(o, 1, message);
 
     fprintf(o->output, "<?xml version='1.0' encoding='UTF-8'?>\n");