From: rjones Date: Fri, 29 Jun 2007 07:40:15 +0000 (+0000) Subject: Implemented help, restart commands. X-Git-Url: http://git.annexia.org/?p=xavierbot.git;a=commitdiff_plain;h=49cb8586a1d3d6b697a92dfcb8977dc0ecfc113f Implemented help, restart commands. --- diff --git a/Makefile.config b/Makefile.config index 39c3bab..772b2db 100644 --- a/Makefile.config +++ b/Makefile.config @@ -1,8 +1,8 @@ # -*- Makefile -*- -# $Id: Makefile.config,v 1.4 2007/06/28 23:18:28 rjones Exp $ +# $Id: Makefile.config,v 1.5 2007/06/29 07:40:15 rjones Exp $ PACKAGE := xavierbot -VERSION := 0.2 +VERSION := 0.3 # Prefix for installation. # - Binaries are installed in $(PREFIX)/sbin diff --git a/xavierbot.pl b/xavierbot.pl index 230612b..8485438 100755 --- a/xavierbot.pl +++ b/xavierbot.pl @@ -2,7 +2,7 @@ # xavierbot : an OCaml interpreter IRC bot. # By Richard W.M. Jones . # This code is in the Public Domain. -# $Id: xavierbot.pl,v 1.5 2007/06/28 23:18:28 rjones Exp $ +# $Id: xavierbot.pl,v 1.6 2007/06/29 07:40:15 rjones Exp $ use strict; use POE qw(Component::IRC Wheel::Run); @@ -12,8 +12,8 @@ use POE qw(Component::IRC Wheel::Run); my $nick = "xavierbot"; my $ircname = "Xavierbot"; # Printable name. -my $server = "chat.freenode.net"; -#my $server = "devserv.devel.redhat.com"; +#my $server = "chat.freenode.net"; +my $server = "devserv.devel.redhat.com"; my $port = 6667; my $channel = "#ocaml"; @@ -24,7 +24,7 @@ $ENV{PATH} = "/usr/bin:/bin"; POE::Session->create ( package_states => [ - main => [ qw(_default _start irc_001 irc_public got_stdout) ], + main => [ qw(_default _start irc_001 irc_public got_stdout got_sigchld) ], ], ); @@ -43,12 +43,9 @@ sub _start port => $port, ) or die "POE::Component::IRC->spawn failed: $!"; - my $ocaml = POE::Wheel::Run->new - ( - Program => "./ocamlbotwrapper", - StdoutEvent => "got_stdout", - StderrEvent => "got_stdout", - ) or die "POE::Wheel::Run->new ./ocamlbotwrapper failed: $!"; + my $ocaml = start_toplevel (); + + $kernel->sig(CHLD => qw(got_sigchld)); $heap->{irc} = $irc; $heap->{ocaml} = $ocaml; @@ -82,8 +79,19 @@ sub irc_public if (my ($stmt) = $what =~ /^\s*([^#].*;;)\s*$/) { $heap->{ocaml}->put ("$stmt\n"); } - elsif ($what =~ /$nick.*restart/) { - print STDOUT "got instruction to restart ...\n" + # XXX How to interpolate $nick into the patterns? + elsif ($what =~ /^\s*xavierbot\b.*\bhelp\b/) { + my $nick = (split /!/, $who)[0]; + $kernel->post ($sender => privmsg => $channel => + "$nick: expr ;; evaluate expr in OCaml toplevel"); + $kernel->post ($sender => privmsg => $channel => + "$nick: help help message"); + $kernel->post ($sender => privmsg => $channel => + "$nick: restart restart the toplevel"); + } + elsif ($what =~ /^\s*xavierbot\b.*\brestart\b/) { + print STDOUT "got instruction to restart ...\n"; + restart_toplevel ($heap->{ocaml}); } undef; } @@ -106,7 +114,7 @@ sub _default #---------------------------------------------------------------------- -# Bot wrote something. +# Toplevel wrote something. sub got_stdout { @@ -114,3 +122,38 @@ sub got_stdout print "Child said: $input\n"; $kernel->post ($heap->{irc} => privmsg => $channel => "$input"); } + +# Got a SIGCHLD, so start the bot up again. + +sub got_sigchld +{ + my ($kernel, $heap) = @_[KERNEL,HEAP]; + my $ocaml = start_toplevel (); + $heap->{ocaml} = $ocaml; +} + +# Start up the toplevel (assumes it's not running). + +sub start_toplevel +{ + return POE::Wheel::Run->new + ( + Program => "./ocamlbotwrapper", + StdoutEvent => "got_stdout", + StderrEvent => "got_stdout", + ) or die "POE::Wheel::Run->new ./ocamlbotwrapper failed: $!"; +} + +# Restart the toplevel - kill the old one, and a new one +# will be spawned after we get the SIGCHLD signal. +# +# XXX Can't send signal to setuid child, so instead just close +# stdin. + +sub restart_toplevel +{ + my $ocaml = shift; + + $ocaml->kill (9); + $ocaml->shutdown_stdin; +} diff --git a/xavierbot.pl.in b/xavierbot.pl.in index 661c016..caaf0f5 100755 --- a/xavierbot.pl.in +++ b/xavierbot.pl.in @@ -2,7 +2,7 @@ # xavierbot : an OCaml interpreter IRC bot. # By Richard W.M. Jones . # This code is in the Public Domain. -# $Id: xavierbot.pl.in,v 1.3 2007/06/28 23:18:28 rjones Exp $ +# $Id: xavierbot.pl.in,v 1.4 2007/06/29 07:40:15 rjones Exp $ use strict; use POE qw(Component::IRC Wheel::Run); @@ -24,7 +24,7 @@ $ENV{PATH} = "/usr/bin:/bin"; POE::Session->create ( package_states => [ - main => [ qw(_default _start irc_001 irc_public got_stdout) ], + main => [ qw(_default _start irc_001 irc_public got_stdout got_sigchld) ], ], ); @@ -43,12 +43,9 @@ sub _start port => $port, ) or die "POE::Component::IRC->spawn failed: $!"; - my $ocaml = POE::Wheel::Run->new - ( - Program => "@WRAPPER@", - StdoutEvent => "got_stdout", - StderrEvent => "got_stdout", - ) or die "POE::Wheel::Run->new @WRAPPER@ failed: $!"; + my $ocaml = start_toplevel (); + + $kernel->sig(CHLD => qw(got_sigchld)); $heap->{irc} = $irc; $heap->{ocaml} = $ocaml; @@ -82,8 +79,19 @@ sub irc_public if (my ($stmt) = $what =~ /^\s*([^#].*;;)\s*$/) { $heap->{ocaml}->put ("$stmt\n"); } - elsif ($what =~ /$nick.*restart/) { - print STDOUT "got instruction to restart ...\n" + # XXX How to interpolate $nick into the patterns? + elsif ($what =~ /^\s*xavierbot\b.*\bhelp\b/) { + my $nick = (split /!/, $who)[0]; + $kernel->post ($sender => privmsg => $channel => + "$nick: expr ;; evaluate expr in OCaml toplevel"); + $kernel->post ($sender => privmsg => $channel => + "$nick: help help message"); + $kernel->post ($sender => privmsg => $channel => + "$nick: restart restart the toplevel"); + } + elsif ($what =~ /^\s*xavierbot\b.*\brestart\b/) { + print STDOUT "got instruction to restart ...\n"; + restart_toplevel ($heap->{ocaml}); } undef; } @@ -106,7 +114,7 @@ sub _default #---------------------------------------------------------------------- -# Bot wrote something. +# Toplevel wrote something. sub got_stdout { @@ -114,3 +122,38 @@ sub got_stdout print "Child said: $input\n"; $kernel->post ($heap->{irc} => privmsg => $channel => "$input"); } + +# Got a SIGCHLD, so start the bot up again. + +sub got_sigchld +{ + my ($kernel, $heap) = @_[KERNEL,HEAP]; + my $ocaml = start_toplevel (); + $heap->{ocaml} = $ocaml; +} + +# Start up the toplevel (assumes it's not running). + +sub start_toplevel +{ + return POE::Wheel::Run->new + ( + Program => "@WRAPPER@", + StdoutEvent => "got_stdout", + StderrEvent => "got_stdout", + ) or die "POE::Wheel::Run->new @WRAPPER@ failed: $!"; +} + +# Restart the toplevel - kill the old one, and a new one +# will be spawned after we get the SIGCHLD signal. +# +# XXX Can't send signal to setuid child, so instead just close +# stdin. + +sub restart_toplevel +{ + my $ocaml = shift; + + $ocaml->kill (9); + $ocaml->shutdown_stdin; +}