Changeset 433

Timestamp:

06/25/12 11:43:48 (12 years ago)

Author:

nanardon

Message:

• implement auto restart for irc bot

Location:

bot/trunk

Files:

• bin/sophie-bot (modified) (1 diff)
• lib/Sophie/Bot.pm (modified) (1 diff)
• lib/Sophie/Bot/IRC.pm (modified) (2 diffs)

bot/trunk/bin/sophie-bot

@@ -51 +51 @@
     type => $type || 'Term',
     proxy => $proxy,
-);
+) or die "Cannot get sophie object\n";
 
 if ($password) {

bot/trunk/lib/Sophie/Bot.pm

@@ -32 +32 @@
     no strict qw(refs);
     eval "require $realclass;";
-    return if($@);
+    if($@) {
+        warn $@;
+        return;
+    }
     bless($self, $realclass);
 }

bot/trunk/lib/Sophie/Bot/IRC.pm

@@ -81 +81 @@
     my $self = $heap->{sophie};
 
-    die "Nick already in use\n";
+    warn "Nickname already in use\n";
+
+    my $config = $self->get_var($heap->{server});
+
+    if (my $pass = $config->{password}) {
+        $irc->yield('privmsg', 'nickserv', "ghost " . $heap->{nick} . " $pass");
+    }
+
+    $_[KERNEL]->stop;
+    #die "Nick already in use\n";
 }
 
@@ -169 +178 @@
     my ($self) = @_;
 
-    if ($self->{options}{ircserver}) {
-        $self->setup_server(
-            $self->{options}{ircserver},
-            $self->{options}{ircnick},
-        );
-    } else {
-        my $resp = $self->send_request('user.fetchdata', 'botconfig');
-        if (ref $resp) {
-            if ($resp->value) {
-                foreach (ref($resp->value->{server}) ? @{$resp->value->{server}}
-                    : $resp->value->{server}) {
-                    $self->setup_server($_);
+    while (1) {
+        if ($self->{options}{ircserver}) {
+            $self->setup_server(
+                $self->{options}{ircserver},
+                $self->{options}{ircnick},
+            );
+        } else {
+            my $resp = $self->send_request('user.fetchdata', 'botconfig');
+            if (ref $resp) {
+                if ($resp->value) {
+                    foreach (ref($resp->value->{server}) ? @{$resp->value->{server}}
+                        : $resp->value->{server}) {
+                        $self->setup_server($_);
+                    }
+                } else {
+                    warn "No config found\n";
+                    return;
                 }
             } else {
-                warn "No config found\n";
+                warn "Cannot fetch config\n";
                 return;
             }
-        } else {
-            warn "Cannot fetch config\n";
-            return;
         }
-    }
-
-    POE::Kernel->run();
+
+        POE::Kernel->run();
+        my $wait = 15 + rand(60);
+        warn "waiting $wait to reconnect\n";
+        sleep($wait);
+    }
 }