![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index b93f07cc7a58c9c717e13303941b4b720f0f92a0..866f60bf5ffbecfbbf463751726d01afb9abd118 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
my ($bus_activ, $bus, $msg_to_bus, $bus_cipher);
my ($server);
my ($gosa_server, $job_queue_timeout, $job_queue_loop_delay);
+my ($messaging_db_loop_delay);
my ($known_modules);
my ($pid_file, $procid, $pid, $log_file);
my ($arp_activ, $arp_fifo);
"targettag DEFAULT 'none'",
"xmlmessage DEFAULT 'none'",
"macaddress DEFAULT 'none'",
+ "plainname DEFAULT 'none'",
);
# holds all other gosa-sd as well as the gosa-sd-bus
# holds all messages which should be delivered to a user
our $messaging_db;
our $messaging_tn = "messaging";
-our @messaging_col_names = ('subject', 'from', 'to', 'flag', 'direction', 'delivery_time', 'message', 'timestamp', 'id INTEGER', );
+our @messaging_col_names = ('subject', 'message_from', 'message_to', 'flag', 'direction', 'delivery_time', 'message', 'timestamp', 'id INTEGER' );
my $messaging_file_name;
# path to directory to store client install log files
"port" => [\$gosa_port, "20082"],
"job-queue" => [\$job_queue_file_name, '/var/lib/gosa-si/jobs.db'],
"job-queue-loop-delay" => [\$job_queue_loop_delay, 3],
+ "messaging-db-loop-delay" => [\$messaging_db_loop_delay, 3],
"key" => [\$GosaPackages_key, "none"],
},
"SIPackages" => {
my ($kernel) = @_ ;
$kernel->delay_set('watch_for_new_jobs', $job_queue_loop_delay);
$kernel->delay_set('watch_for_done_jobs', $job_queue_loop_delay);
+ $kernel->delay_set('watch_for_new_messages', $messaging_db_loop_delay);
+ $kernel->delay_set('watch_for_done_messages', $messaging_db_loop_delay);
}
sub watch_for_done_jobs {
}
+sub watch_for_new_messages {
+ my ($kernel,$heap) = @_[KERNEL, HEAP];
+ my @coll_user_msg; # collection list of outgoing messages
+
+ # check messaging_db for new incoming messages with executable timestamp
+ my $timestamp = &get_time();
+ #my $sql_statement = "SELECT * FROM $messaging_tn WHERE (CAST (delivery_time AS INTEGER) + 120) < $timestamp";
+ my $sql_statement = "SELECT * FROM $messaging_tn WHERE ( (CAST(timestamp AS INTEGER))<$timestamp AND flag='n' AND direction='in' )";
+ my $res = $messaging_db->exec_statement( $sql_statement );
+
+ foreach my $hit (@{$res}) {
+
+ # create outgoing messages
+ my $message_to = @{$hit}[2];
+
+ # translate message_to to plain login name
+ my @reciever_l = ($message_to);
+ my $message_id = @{$hit}[8];
+
+ #add each outgoing msg to messaging_db
+ my $reciever;
+ foreach $reciever (@reciever_l) {
+ my $sql_statement = "INSERT INTO $messaging_tn (subject, message_from, message_to, flag, direction, delivery_time, message, timestamp, id) ".
+ "VALUES ('".
+ @{$hit}[0]."', '". # subject
+ @{$hit}[1]."', '". # message_from
+ $reciever."', '". # message_to
+ "none"."', '". # flag
+ "out"."', '". # direction
+ @{$hit}[5]."', '". # delivery_time
+ @{$hit}[6]."', '". # message
+ $timestamp."', '". # timestamp
+ @{$hit}[8]. # id
+ "')";
+ &daemon_log("M DEBUG: $sql_statement", 1);
+ my $res = $messaging_db->exec_statement($sql_statement);
+ &daemon_log("M INFO: message '".@{$hit}[8]."' is prepared for delivery to reciever '$reciever'", 5);
+ }
+
+ # send outgoing messages
+ my $sql_statement = "SELECT * FROM $messaging_tn WHERE ( flag='p' AND direction='out' )";
+ my $res = $messaging_db->exec_statement( $sql_statement );
+ foreach my $hit (@{$res}) {
+ # add subject, from, to and message to list coll_user_msg
+ my @user_msg = [@{$hit}[0], @{$hit}[1], $reciever, @{$hit}[6]];
+ push( @coll_user_msg, \@user_msg);
+ }
+
+ # send outgoing list to myself (gosa-si-server) to deliver each message to user
+ # reason for this workaround: if to much messages have to be delivered, it can come to
+ # denial of service problems of the server. so, the incoming message list can be processed
+ # by a forked child and gosa-si-server is always ready to work.
+ my $collection_out_msg = &create_xml_hash("collection_user_messages", $server_address, $server_address);
+ # add to hash 'msg1' => [subject, from, to, message]
+ # hash to string
+ # send msg to myself
+# TODO
+
+ # set incoming message to flag d=deliverd
+ $sql_statement = "UPDATE $messaging_tn SET flag='p' WHERE id='$message_id'";
+ &daemon_log("M DEBUG: $sql_statement", 7);
+ $res = $messaging_db->update_dbentry($sql_statement);
+ &daemon_log("M INFO: message '".@{$hit}[8]."' is set to flag 'p' (processed)", 5);
+
+ }
+
+ $kernel->delay_set('watch_for_new_messages', $messaging_db_loop_delay);
+
+
+ return;
+}
+
+
+sub watch_for_done_messages {
+ my ($kernel,$heap) = @_[KERNEL, HEAP];
+
+ $kernel->delay_set('watch_for_done_messages', $messaging_db_loop_delay);
+ return;
+}
+
+
sub get_ldap_handle {
my ($session_id) = @_;
my $heap;
my $ldap_handle;
if (not defined $session_id ) { $session_id = 0 };
+ if ($session_id =~ /[^0-9]*/) { $session_id = 0 };
if ($session_id == 0) {
daemon_log("$session_id DEBUG: get_ldap_handle invoked without a session_id, create a new ldap_handle", 7);
sub create_fai_server_db {
- my ($table_name, $kernel) = @_;
+ my ($table_name, $kernel, $dont_create_packages_list, $session_id) = @_;
my $result;
+
+ if (not defined $session_id) { $session_id = 0; }
my $ldap_handle = &get_ldap_handle();
if(defined($ldap_handle)) {
- daemon_log("INFO: create_fai_server_db: start", 5);
+ daemon_log("$session_id INFO: create_fai_server_db: start", 5);
my $mesg= $ldap_handle->search(
base => $ldap_base,
scope => 'sub',
}
}
}
- daemon_log("INFO: create_fai_server_db: finished", 5);
+ daemon_log("$session_id INFO: create_fai_server_db: finished", 5);
# TODO: Find a way to post the 'create_packages_list_db' event
- &create_packages_list_db($ldap_handle);
+ if(!defined($dont_create_packages_list)) {
+ #&create_packages_list_db;
+ &create_packages_list_db(undef, undef, $session_id);
+ }
}
$ldap_handle->disconnect;
sub create_fai_release_db {
- my ($table_name) = @_;
+ my ($table_name, $session_id) = @_;
my $result;
+ # used for logging
+ if (not defined $session_id) { $session_id = "0"; }
+
my $ldap_handle = &get_ldap_handle();
if(defined($ldap_handle)) {
- daemon_log("INFO: create_fai_release_db: start",5);
+ daemon_log("$session_id INFO: create_fai_release_db: start",5);
my $mesg= $ldap_handle->search(
base => $ldap_base,
scope => 'sub',
}
}
}
- daemon_log("DEBUG: Inserting ".scalar @sql_list." entries to DB",6);
+
+ daemon_log("$session_id DEBUG: Inserting ".scalar @sql_list." entries to DB",9);
if(@sql_list) {
unshift @sql_list, "DELETE FROM $table_name";
$fai_server_db->exec_statementlist(\@sql_list);
}
- daemon_log("DEBUG: Done with inserting",6);
+ daemon_log("$session_id DEBUG: Done with inserting",6);
}
- daemon_log("INFO: create_fai_release_db: finished",5);
+ daemon_log("$session_id INFO: create_fai_release_db: finished",5);
}
$ldap_handle->disconnect;
return $result;
}
+
+
sub run_create_fai_release_db {
my ($session, $heap, $table_name) = @_[SESSION, HEAP, ARG0];
my $task = POE::Wheel::Run->new(
}
sub create_sources_list {
- my ($ldap_handle) = @_;
+ my $ldap_handle = &get_ldap_handle;
my $result="/tmp/gosa_si_tmp_sources_list";
# Remove old file
}
sub create_packages_list_db {
- my ($ldap_handle, $sources_file) = @_ ;
+ my ($ldap_handle, $sources_file, $session_id);
if (not defined $ldap_handle) {
$ldap_handle= &get_ldap_handle();
return;
}
}
-
if (not defined $sources_file) {
- $sources_file = &create_sources_list($ldap_handle);
+ $sources_file = &create_sources_list;
}
+ if (not defined $session_id) { $session_id = 0; }
my $line;
daemon_log("INFO: create_packages_list_db: start", 5);
my( $baseurl, $dist, $sections ) = ($line =~ /^deb\s([^\s]+)\s+([^\s]+)\s+(.*)$/);
my $section;
foreach $section (split(' ', $sections)){
- &parse_package_info( $baseurl, $dist, $section );
+ &parse_package_info( $baseurl, $dist, $section, $session_id );
}
}
}
}
sub parse_package_info {
- my ($baseurl, $dist, $section)= @_;
+ my ($baseurl, $dist, $section, $session_id)= @_;
my ($package);
my ($path) = ($baseurl =~ m%://[^/]*(.*)$%);
foreach $package ("Packages.gz"){
daemon_log("DEBUG: create_packages_list: fetch $baseurl, $dist, $section", 7);
get_package( "$baseurl/dists/$dist/$section/binary-$arch/$package", "$outdir/$dist/$section" );
- parse_package( "$outdir/$dist/$section", $dist, $path );
+ parse_package( "$outdir/$dist/$section", $dist, $path, $session_id );
}
- find(\&cleanup_and_extract, keys( %repo_dirs ) );
+ find(\&cleanup_and_extract($session_id), keys( %repo_dirs ));
}
sub get_package {
}
sub parse_package {
- my ($path, $dist, $srv_path)= @_;
+ my ($path, $dist, $srv_path, $session_id)= @_;
+ if (not defined $session_id) { $session_id = 0;}
my ($package, $version, $section, $description);
my @sql_list;
my $PACKAGES;
if(not stat("$path.in")) {
- daemon_log("ERROR: create_packages_list: parse_package: file '$path.in' is not readable",1);
+ daemon_log("$session_id ERROR: create_packages_list: parse_package: file '$path.in' is not readable",1);
return;
}
open($PACKAGES, "<$path.in");
if(not defined($PACKAGES)) {
- daemon_log("ERROR: create_packages_list_db: parse_package: can not open '$path.in'",1);
+ daemon_log("$session_id ERROR: create_packages_list_db: parse_package: can not open '$path.in'",1);
return;
}
}
sub cleanup_and_extract {
+ my ($session_id) = @_ ;
my $fileinfo = $repo_files{ $File::Find::name };
if( defined $fileinfo ) {
if( -f "$dir/DEBIAN/templates" ) {
- daemon_log("DEBUG: Found debconf templates in '$package' - $newver", 5);
+ daemon_log("$session_id DEBUG: Found debconf templates in '$package' - $newver", 5);
my $tmpl= "";
{
inline_states => {
_start => \&_start,
sig_handler => \&sig_handler,
+ watch_for_new_messages => \&watch_for_new_messages,
+ watch_for_done_messages => \&watch_for_done_messages,
watch_for_new_jobs => \&watch_for_new_jobs,
watch_for_done_jobs => \&watch_for_done_jobs,
create_packages_list_db => \&run_create_packages_list_db,