update to use Queue client

diff --git a/lib/Mubot4FB.pm b/lib/Mubot4FB.pm
index 350654d..6222d4d 100644 (file)
--- a/lib/Mubot4FB.pm
+++ b/lib/Mubot4FB.pm
@@ -12,7 +12,7 @@ use POSIX 'strftime';
 
 use Mubot4FB::DB;
 use Mubot4FB::FB;
-use Mubot4FB::Queue;
+use Mubot4FB::Queue::Client;
 
 use Data::Dumper;
 
@@ -32,7 +32,7 @@ sub init {
        my ($me) = @_;
        $me->{fb} = Mubot4FB::FB->new($me->{cfg});
        $me->{db} = Mubot4FB::DB->new($me->{cfg});
-       $me->{queue} = Mubot4FB::Queue->new($me->{cfg});
+       $me->{queue} = Mubot4FB::Queue::Client->new($me->{cfg}, $me->{db}->{dbh});
        $me->misc_init;
        return 1;
 }
@@ -69,10 +69,12 @@ sub _add {
                        my $post_ok = 1;
                        eval{$resp = $me->{fb}->publish($text, $uri)};
                        if ($@) {
+                               warn;
                                warn Dumper($resp) if ($me->{cfg}->{debug});
                                $me->{fb}->init();
                                eval{$resp = $me->{fb}->publish($text, $uri)};
                                $post_ok = 0 if ($@);
+                               warn;
                                warn Dumper($resp) if ($me->{cfg}->{debug});
                        }
 
@@ -85,10 +87,8 @@ sub _add {
                                               comment => $comment};
                                $me->{db}->add($db_args);
                                if (defined $me->{cfg}->{queues}) {
-                                       $db_args->{_command} = 'add';
-                                       $db_args->{_cfg} = $me->{cfg};
                                        foreach my $funcname (@{$me->{cfg}->{queues}}) {
-                                               $me->{queue}->enqueue($funcname, $db_args);
+                                               $me->{queue}->enqueue($funcname, {fb_post_id => $post_id, command => 'add', cfg => $me->{cfg}});
                                        }
                                }
                                $resp_msg = $args->{who} . ': うい  '.$me->{fb}->post_uri($post_id).' で登録';
@@ -126,7 +126,7 @@ sub _remove {
                        $me->{db}->commit;
                        if (defined $me->{cfg}->{queues}) {
                                foreach my $funcname (@{$me->{cfg}->{queues}}) {
-                                       $me->{queue}->enqueue($funcname, {_command => 'remove', _cfg => $me->{cfg}, post_id => $post_id});
+                                       $me->{queue}->enqueue($funcname, {command => 'remove', cfg => $me->{cfg}, fb_post_id => $post_id});
                                }
                        }
                        $resp_msg = $args->{who} . ': 削除しました ' . $me->{fb}->post_uri($post_id);