X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=persistant_worker.pl;h=647b2bdf4646df332fad89917b981d3c52e849be;hb=516c0e6f30c2fb9e16eada973a35a46d7000ee3a;hp=a5e0b2123e3af5dc4372e7afbcd6c4bc24768b05;hpb=85d8c005e2782e8d32b77c48ab7ca002cc743916;p=APKPM.git

diff --git a/persistant_worker.pl b/persistant_worker.pl
index a5e0b21..647b2bd 100755
--- a/persistant_worker.pl
+++ b/persistant_worker.pl
@@ -109,10 +109,11 @@ foreach my $ip ( keys %$poll ) {
 		}
 
 		$self->do_background_json( 'Store_insert', {
-			_table => 'dslam_h',
+			_table => 'dslam',
 			ip => $crm->{IP_MANAGEMENT}, # FIXME IP_UREDAJA ?
 			username => $username,
 			timestamp => $self->datetime_now,
+			variant => $variant,
 			h => $self->to_hstore($hash),
 		});
 
@@ -132,9 +133,9 @@ $driver->add_job({
 	max_processes => 1,
 	min_processes => 0,
 	worker		=> $worker,
-	name		=> "poll_$variant",
+	name		=> $variant . '_poll',
 	methods	   => [ {
-		name		=> "poll_$variant",
+		name   => $variant . '_poll',
 		encode => 'e_json',
 		body   => sub {
 
@@ -197,17 +198,22 @@ $driver->add_job({
 		my $status = APKPM::Model->redis_status;
 		my $row = $status->{poll}->{$variant};
 		$row->{$_} = $status->{"$variant.poll.$_"} foreach ( 'start', 'finish' );
-		$self->do_background_json('Store_insert', { _table => 'zte_poll', %$row });
-		warn "# zte_poll ",dump($row);
+		$row->{variant} = $variant;
+		$self->do_background_json('Store_insert', { _table => 'dslam_poll', %$row });
+		warn "# dslam_poll ",dump($row);
 
 		my $ips = scalar keys %$seen;
 		my $ports = 0;
 		$ports += scalar keys %{ $seen->{$_} } foreach keys %$seen;
 		warn "# finish $ips ips with $ports ports\n";
-		return { ips => $ips, ports => $ports, zte_poll => $row }  ; # body end
+		return { ips => $ips, ports => $ports, dslam_poll => $row }  ; # body end
 		}
 	} ],
 });
 
+open(my $pid, '>', "/tmp/apkpm.$variant.pid");
+print $pid "$$\n";
+close $pid;
+
 $driver->run;