[Openvas-commits] r5394 - in trunk/openvas-manager: . src

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2009-10-06 11:48:22 +0200 (Tue, 06 Oct 2009)
New Revision: 5394

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/tasks_sql.h
Log:
	* src/tasks_sql.h (init_manage): Log database versions on version failure.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2009-10-06 09:46:36 UTC (rev 5393)
+++ trunk/openvas-manager/ChangeLog	2009-10-06 09:48:22 UTC (rev 5394)
@@ -1,5 +1,9 @@
 2009-10-06  Matthew Mundell <matthew.mundell at intevation.de>
 
+	* src/tasks_sql.h (init_manage): Log database versions on version failure.
+
+2009-10-06  Matthew Mundell <matthew.mundell at intevation.de>
+
 	Complete database initialisation check started yesterday.
 
 	* src/tasks_sql.h (init_manage): Add nvt_cache_mode arg.  Update caller.

Modified: trunk/openvas-manager/src/tasks_sql.h
===================================================================
--- trunk/openvas-manager/src/tasks_sql.h	2009-10-06 09:46:36 UTC (rev 5393)
+++ trunk/openvas-manager/src/tasks_sql.h	2009-10-06 09:48:22 UTC (rev 5394)
@@ -918,7 +918,15 @@
     {
       if (database_version
           && strcmp (database_version, G_STRINGIFY (DATABASE_VERSION)))
-        return -2;
+        {
+          g_message ("%s: database version of database: %s\n",
+                     __FUNCTION__,
+                     database_version);
+          g_message ("%s: database version supported by manager: %s\n",
+                     __FUNCTION__,
+                     G_STRINGIFY (DATABASE_VERSION));
+          return -2;
+        }
 
       /* If database_version was NULL then meta was missing, so assume
        * that the database is missing, which is OK. */
@@ -928,7 +936,15 @@
       if (database_version)
         {
           if (strcmp (database_version, G_STRINGIFY (DATABASE_VERSION)))
-            return -2;
+            {
+              g_message ("%s: database version of database: %s\n",
+                         __FUNCTION__,
+                         database_version);
+              g_message ("%s: database version supported by manager: %s\n",
+                         __FUNCTION__,
+                         G_STRINGIFY (DATABASE_VERSION));
+              return -2;
+            }
         }
       else
         /* Assume database is missing. */