![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 5c9bb9a472130f1352390931c23114317f147577..d5a0a6b4b1f4f8abdef8c2a278e15df2c1948ba0 100644 (file)
my @msg_l;
my @out_msg_l;
- &main::daemon_log("DEBUG: GosaPackages: receive '$header'", 8);
+ &main::daemon_log("DEBUG: GosaPackages: msg to process '$header'", 7);
if ($header =~ /^job_/) {
@msg_l = &process_job_msg($msg, $msg_hash, $session_id);
# keep job queue up-to-date and save result and status
if (defined ($out_msg) && $out_msg =~ /<jobdb_id>(\d+)<\/jobdb_id>/) {
my $job_id = $1;
- my $sql = "UPDATE '".$main::job_queue_table_name."'".
+ my $sql = "UPDATE '".$main::job_queue_tn."'".
" SET status='processing'".
" WHERE id='$job_id'";
my $res = $main::job_db->exec_statement($sql);
sub process_gosa_msg {
my ($msg, $msg_hash, $session_id) = @_ ;
my $out_msg;
- my @out_msg_l;
+ my @out_msg_l = ('nohandler');
my $header = @{$msg_hash->{'header'}}[0];
$header =~ s/gosa_//;
- # decide wether msg is a core function or a event handler
- if ( $header eq 'query_jobdb') {
- @out_msg_l = &query_jobdb
- } elsif ($header eq 'delete_jobdb_entry') {
- @out_msg_l = &delete_jobdb_entry
- } elsif ($header eq 'clear_jobdb') {
- @out_msg_l = &clear_jobdb
- } elsif ($header eq 'update_status_jobdb_entry' ) {
- @out_msg_l = &update_status_jobdb_entry
- } elsif ($header eq 'count_jobdb' ) {
- @out_msg_l = &count_jobdb
- } else {
- # msg could not be assigned to core function
- # maybe it is an eventa
- if( exists $event_hash->{$header} ) {
- # a event exists with the header as name
- &main::daemon_log("found event '$header' at event-module '".$event_hash->{$header}."'", 5);
- no strict 'refs';
- @out_msg_l = &{$event_hash->{$header}."::$header"}($msg, $msg_hash, $session_id);
- }
+ if( exists $event_hash->{$header} ) {
+ # a event exists with the header as name
+ &main::daemon_log("INFO: found event '$header' at event-module '".$event_hash->{$header}."'", 5);
+ no strict 'refs';
+ @out_msg_l = &{$event_hash->{$header}."::$header"}($msg, $msg_hash, $session_id);
+ }
+
+ # if incoming 'gosa_'-msg is scheduled from job_queue, than it contains xml-tag 'jobdb_id'
+ # after procesing this msg, set status of this job in job_queue to done
+ if ($msg =~ /<jobdb_id>(\d+)<\/jobdb_id>/) {
+ my $sql_statement = "UPDATE $main::job_queue_tn ".
+ "SET status='done' ".
+ "WHERE id='$1'";
+ &main::daemon_log("DEBUG: $sql_statement", 7);
+ my $res = $main::job_db->update_dbentry($sql_statement);
+ &main::daemon_log("INFO: set job '$1' to status processed", 5);
}
# if delivery not possible raise error and return
- if( not @out_msg_l ) {
- &main::daemon_log("ERROR: GosaPackages: no event handler or core function defined for $header", 1);
- } elsif( 0 == @out_msg_l) {
- &main::daemon_log("ERROR: GosaPackages got not answer from event_handler $header", 1);
+ if( not defined $out_msg_l[0] ) {
+ &main::daemon_log("WARNING: GosaPackages got no answer from event handler '$header'", 3);
+ @out_msg_l = ();
+ } elsif( $out_msg_l[0] eq 'nohandler') {
+ &main::daemon_log("ERROR: GosaPackages: no event handler or core function defined for '$header'", 1);
+ @out_msg_l = ();
}
return @out_msg_l;
my $macaddress;
if( exists $msg_hash->{'macaddress'} ) {
$macaddress = @{$msg_hash->{'macaddress'}}[0];
+ } elsif (@{$msg_hash->{'target'}}[0] =~ /^([0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2})$/i ) {
+ $macaddress = $1;
} else {
$error ++;
$out_msg = "<xml>".
"<source>$server_address</source>".
"<target>GOSA</target>".
"<answer1>1</answer1>".
- "<error_string>no mac address specified</error_string>".
+ "<error_string>no mac address specified, neither in target-tag nor in macaddres-tag</error_string>".
"</xml>";
}
if( $error == 0 ) {
# add job to job queue
- my $func_dic = {table=>$main::job_queue_table_name,
- primkey=>'id',
+ my $func_dic = {table=>$main::job_queue_tn,
+ primkey=>['id'],
timestamp=>$timestamp,
status=>'waiting',
result=>'none',
return @out_msg_l;
}
-
-
-## CORE FUNCTIONS ############################################################
-
-sub query_jobdb {
- my ($msg) = @_;
- my $msg_hash = &transform_msg2hash($msg);
- my $target = @{$msg_hash->{'target'}}[0];
- my $source = @{$msg_hash->{'source'}}[0];
-
- # prepare query sql statement
- my $select= &get_select_statement($msg, $msg_hash);
- my $table= $main::job_queue_tn;
- my $where= &get_where_statement($msg, $msg_hash);
- my $limit= &get_limit_statement($msg, $msg_hash);
- my $orderby= &get_orderby_statement($msg, $msg_hash);
- my $sql_statement= "SELECT $select FROM $table $where $orderby $limit";
-
- # execute db query
- my $res_hash = $main::job_db->select_dbentry($sql_statement);
- my $out_xml = &db_res2si_msg($res_hash, "query_jobdb", $target, $source);
- my @out_msg_l = ( $out_xml );
- return @out_msg_l;
-}
-
-
-sub count_jobdb {
- my ($msg)= @_;
- my $out_xml= "<xml><count>error</count></xml>";
-
- # prepare query sql statement
- my $table= $main::job_queue_table_name;
- my $sql_statement= "SELECT * FROM $table ";
-
- # execute db query
- my $res_hash = $main::job_db->select_dbentry($sql_statement);
-
- my $count = keys(%{$res_hash});
- $out_xml= "<xml><header>answer</header><source>$server_address</source><target>GOSA</target><count>$count</count></xml>";
- my @out_msg_l = ( $out_xml );
- return @out_msg_l;
-}
-
-
-sub delete_jobdb_entry {
- my ($msg) = @_ ;
- my $msg_hash = &transform_msg2hash($msg);
-
- # prepare query sql statement
- my $table= $main::job_queue_table_name;
- my $where= &get_where_statement($msg, $msg_hash);
- my $sql_statement = "DELETE FROM $table $where";
-
- # execute db query
- my $db_res = $main::job_db->del_dbentry($sql_statement);
-
- my $res;
- if( $db_res > 0 ) {
- $res = 0 ;
- } else {
- $res = 1;
- }
-
- # prepare xml answer
- my $out_xml = "<xml><header>answer</header><source>$server_address</source><target>GOSA</target><answer1>$res</answer1></xml>";
- my @out_msg_l = ( $out_xml );
- return @out_msg_l;
-
-}
-
-
-sub clear_jobdb {
- my ($msg) = @_ ;
- my $msg_hash = &transform_msg2hash($msg);
- my $error= 0;
- my $out_xml= "<xml><answer1>1</answer1></xml>";
-
- my $table= $main::job_queue_table_name;
-
- my $sql_statement = "DELETE FROM $table";
- my $db_res = $main::job_db->del_dbentry($sql_statement);
- if( not $db_res > 0 ) { $error++; };
-
- if( $error == 0 ) {
- $out_xml = "<xml><header>answer</header><source>$server_address</source><target>GOSA</target><answer1>0</answer1></xml>";
- }
- my @out_msg_l = ( $out_xml );
- return @out_msg_l;
-}
-
-
-sub update_status_jobdb_entry {
- my ($msg) = @_ ;
- my $msg_hash = &transform_msg2hash($msg);
- my $error= 0;
- my $out_xml= "<xml><header>answer</header><source>$server_address</source><target>GOSA</target><answer1>1</answer1></xml>";
-
- my @len_hash = keys %{$msg_hash};
- if( 0 == @len_hash) { $error++; };
-
- # prepare query sql statement
- if( $error == 0) {
- my $table= $main::job_queue_table_name;
- my $where= &get_where_statement($msg, $msg_hash);
- my $update= &get_update_statement($msg, $msg_hash);
-
- # conditions
- # no timestamp update if status eq waiting
- my $res_hash = $main::job_db->select_dbentry("SELECT * FROM $table $where AND status='processing' ");
- if( (0 != keys(%$res_hash)) && ($update =~ /timestamp/i) ) {
- $error ++;
- $out_xml = "<answer1>1</answer1><error_string>there is no timestamp update allowed while status is 'processing'</error_string>";
- }
-
- if( $error == 0 ) {
- my $sql_statement = "UPDATE $table $update $where";
- # execute db query
- my $db_res = $main::job_db->update_dbentry($sql_statement);
-
- # check success of db update
- if( not $db_res > 0 ) { $error++; };
-
- }
- }
-
- if( $error == 0) {
- $out_xml = "<answer1>0</answer1>";
- }
-
- my $out_msg = sprintf("<xml><header>answer</header><source>%s</source><target>GOSA</target>%s</xml>", $server_address, $out_xml);
- my @out_msg_l = ( $out_msg );
- return @out_msg_l;
-}
-
-
1;