diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index fab6e0f686c8868c3295c7337e4838533da01927..dc82ecbef8735aa547fab5266472648e633bf9b1 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
my $modules_path = "/usr/lib/gosa-si/modules";
use lib "/usr/lib/gosa-si/modules";
-my $server_version = "$HeadURL$:$Rev$";
+my $server_version = '$HeadURL$:$Rev$';
+my $server_headURL;
+my $server_revision;
+my $server_status;
+
# TODO es gibt eine globale funktion get_ldap_handle
# - ist in einer session dieses ldap handle schon vorhanden, wird es zurückgegeben
if(not defined $level) { $level = 1 }
if(defined $log_file){
open(LOG_HANDLE, ">>$log_file");
+ chmod 0600, $log_file;
if(not defined open( LOG_HANDLE, ">>$log_file" )) {
print STDERR "cannot open $log_file: $!";
return }
my %data = ('subject' => $subject, 'message' => $message, 'usr' => $receiver);
my $out_msg = &build_msg("usr_msg", $server_address, $receiver_host, \%data );
my $error = &send_msg_to_target($out_msg, $receiver_host, $receiver_key, "usr_msg", 0);
- if ($error != 0 ) {
+ if ($error == 0 ) {
$send_succeed++ ;
}
}
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")};
};
}
+# parse head url and revision from svn
+my $server_status_hash = { 'developmental'=>'revision', 'stable'=>'release'};
+$server_version =~ /^\$HeadURL: (\S+) \$:\$Rev: (\d+) \$$/;
+$server_headURL = defined $1 ? $1 : 'unknown' ;
+$server_revision = defined $2 ? $2 : 'unknown' ;
+if ($server_headURL =~ /\/tag\// ||
+ $server_headURL =~ /\/branches\// ) {
+ $server_status = "stable";
+} else {
+ $server_status = "developmental" ;
+}
+
+
daemon_log(" ", 1);
daemon_log("$0 started!", 1);
+daemon_log("status: $server_status", 1);
+daemon_log($server_status_hash->{$server_status}.": $server_revision", 1);
if ($no_bus > 0) {
$bus_activ = "false"