Added more robustness when crashing on creating package lists.

[gosa.git] / gosa-si / gosa-si-server

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index 90c628240a2c64276b61e799969b6a398633bd1e..dc82ecbef8735aa547fab5266472648e633bf9b1 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -288,7 +288,8 @@ sub daemon_log {
     if(not defined $msg) { return }
     if(not defined $level) { $level = 1 }
     if(defined $log_file){
-        open(LOG_HANDLE, ">>$log_file", 0600);
+        open(LOG_HANDLE, ">>$log_file");
+        chmod 0600, $log_file;
         if(not defined open( LOG_HANDLE, ">>$log_file" )) {
             print STDERR "cannot open $log_file: $!";
             return }
@@ -2209,14 +2210,25 @@ sub create_packages_list_db {
        close (CONFIG);
 
        find(\&cleanup_and_extract, keys( %repo_dirs ));
-       &main::strip_packages_list_statements();
+       eval {
+               &main::strip_packages_list_statements();
+       };
+       if($@) {
+               daemon_log("$session_id ERROR: Preparation of statement list failed with '$@'!", 1);
+       }
        unshift @packages_list_statements, "VACUUM";
-       $packages_list_db->exec_statementlist(\@packages_list_statements);
+       eval {
+               $packages_list_db->exec_statementlist(\@packages_list_statements);
+       };
+       if($@) {
+               daemon_log("$session_id ERROR: Updating package_list_db failed with '$@'!", 1);
+       }
        unlink($packages_list_under_construction);
        daemon_log("$session_id INFO: create_packages_list_db: finished", 5); 
        return;
 }
 
+
 # This function should do some intensive task to minimize the db-traffic
 sub strip_packages_list_statements {
     my @existing_entries= @{$packages_list_db->exec_statement("SELECT * FROM $main::packages_list_tn")};