X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=persistant_worker.pl;h=42dabe86e62ae2a7ee3087ea76029ac29382105e;hb=b7ad83dc3edd53f4023f67440774c636e120cec2;hp=29a0ece2f23e3833ec3b59f8a81a57d57357c720;hpb=2feea97c61e2335d82e4b1d91fd9253883fb6f8b;p=APKPM.git

diff --git a/persistant_worker.pl b/persistant_worker.pl
index 29a0ece..42dabe8 100755
--- a/persistant_worker.pl
+++ b/persistant_worker.pl
@@ -76,7 +76,7 @@ foreach my $ip ( keys %$poll ) {
 		methods	   => [
 			{
 				decode => 'd_json',
-#				encode => 'e_json',
+				encode => 'e_json',
 				name   => $method,
 				body   => sub {
 
@@ -100,23 +100,24 @@ foreach my $ip ( keys %$poll ) {
 
 		if ( $@ ) {
 			$redis->sadd("$variant.$ip.error" => $@);
-			return "error: $@";
+			return { error => $@ };
 		} elsif ( ! $hash ) {
 			$redis->sadd("$variant.$ip.empty" => $port);
-			return "empty";
+			return { error => 'empty' };
 		} else {
 			$redis->sadd("$variant.$ip.ok" => $port);
 		}
 
 		$self->do_background_json( 'Store_insert', {
-			_table => 'dslam_h',
+			_table => 'dslam',
 			ip => $crm->{IP_MANAGEMENT}, # FIXME IP_UREDAJA ?
 			username => $username,
 			timestamp => $self->datetime_now,
-			h => $self->to_hstore($hash),
+			variant => $variant,
+			h => $hash,
 		});
 
-		return "ok $username $ip $port"; # body end
+		return $hash; # body end
 
 # XXX -- worker body
 				},
@@ -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 {
 
@@ -198,14 +199,14 @@ $driver->add_job({
 		my $row = $status->{poll}->{$variant};
 		$row->{$_} = $status->{"$variant.poll.$_"} foreach ( 'start', 'finish' );
 		$row->{variant} = $variant;
-		$self->do_background_json('Store_insert', { _table => 'zte_poll', %$row });
-		warn "# zte_poll ",dump($row);
+		$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
 		}
 	} ],
 });