Changeset 14403 for misc/runpugs

Timestamp:

10/18/06 01:01:34 (2 years ago)

Author:

andara

Message:

[runpugs]
-now limits generated output (to 256 lines)
-runpugs is now a semi-self(re)starter
-added some minimal logging

Location:

misc/runpugs

Files:

• cgi-bin/runpugs (modified) (1 diff)
• lib/WebTerminal/Server.pm (modified) (7 diffs)
• lib/WebTerminal/Server/Terminal.pm (modified) (4 diffs)

misc/runpugs/cgi-bin/runpugs

@@ -65 +65 @@
 if ( $query->param()) {      # an action has been chosen
     my $cmd=$query->param("cmd");
-     my $action =  $query->param("action")||'runpugs';
+    my $action =  $query->param("action")||'runpugs';
     if ($action =~ /^(\w+)$/) {
-        $action = $1;
-        if ($access_OK) {
-            if ($action eq "runpugs") {
-                &runpugs($query,$cmd,$sessionid,$ip);
-            } 
-    } else {
-        my $warning_message="Action has illegal chars: $action";
-    &runpugs($query,'',$sessionid,$ip);
+        $action = $1;
+        if ($access_OK) {
+                if ($action eq "runpugs") {
+                        &runpugs($query,$cmd,$sessionid,$ip);
+                } 
+        } else {
+            &runpugs($query,'init',$sessionid,$ip);
+        }
+    } else {            # no action has been taken, display login page
+       my $warning_message="Action has illegal chars: $action";
+       &runpugs($query,'init',$sessionid,$ip);
     }
-} else {            # no action has been taken, display login page
-    &runpugs($query,'',$sessionid,$ip);
-}
 } else {
          &runpugs($query,'',$sessionid,$ip);

misc/runpugs/lib/WebTerminal/Server.pm

@@ -40 +40 @@
     } else {
         if ( exists $terminals{$id} ) {
+        if ($terminals{$id}->{pid}) {
                 $terminals{$id}->{called}=time;
                     my $term  = $terminals{$id};
@@ -45 +46 @@
                 if ( $cmd eq ':q' ) {
                         delete $terminals{$id};
+                 my $pid= $terminals{$id}->{pid};
+                 if ($pid) {
+                     kill 9,$pid;
+                 }
                 $sessions_per_ip{$ip}--;
                 }
             if ($lines=~/Aborted/s) {
                  delete $terminals{$id};
+                 my $pid= $terminals{$id}->{pid};
+                 if ($pid) {
+                     kill 9,$pid;
+                 }
                 $sessions_per_ip{$ip}--;
             }
                 return $lines;
+           } else {
+           return "pugs> ";
+           }
         } else {
             if ($sessions_per_ip{$ip}>10) {
@@ -74 +86 @@
                         ( my $id, my $ip, my $cmd ) = split( "\n", $msg, 3 );
             $cmd=pack("U0C*", unpack("C*",$cmd));
-#            print "$id($ip): ",$cmd,"\n";
+            my $pid=0;
+            if(exists $terminals{$id}) {
+            $pid=$terminals{$id}->{pid};
+            }
+            my $nsess=scalar keys %terminals;
+            print scalar(localtime)," : $nsess : $ip : $id : $pid > ",$cmd,"\n";
+            print LOG scalar(localtime)," : $nsess : $ip : $id : $pid > ",$cmd,"\n";
                         my $lines = &termhandler( $id, $ip, $cmd );
                         $conn->send_now("$id\n$lines");
@@ -91 +109 @@
     my $port=shift;
     $SIG{USR1}=\&timeout;
+my $daemon=0;
+if ($daemon) {
     Proc::Daemon::Init;
+}
     # fork/exec by the book:
     use Errno qw(EAGAIN);
@@ -98 +119 @@
         if ($pid=fork) {
             #parent here
+            use Cwd;
+            print cwd();
+            open(LOG,">/home/andara/apache/data/runpugs.log");
             WebTerminal::Msg->new_server( $host, $port, \&login_proc );
             WebTerminal::Msg->event_loop();
@@ -103 +127 @@
            # child here
            while (getppid()>10) { # a bit ad-hoc.
-               sleep 300;
+               sleep 60;
                 #print getppid(),"\n";
                 kill 'USR1',getppid();
             }
+            sleep 5;
+            system("killall /usr/bin/pugs");
+            chdir "/home/andara/apache/cgi-bin/";
+            exec('/usr/bin/perl ../bin/termserv.pl');
         } elsif ($! == EAGAIN) {
             sleep 5;
@@ -122 +150 @@
         if ($now-$then>600) {
         if(exists $terminals{$id}) {
+            my $pid= $terminals{$id}->{pid};
             my $ip=$terminals{$id}->{ip};
             $sessions_per_ip{$ip}--;
-            $terminals{$id}->write(':q');
+            if ($pid) {
+                kill 9,$pid;
+            }
+#            $terminals{$id}->write(':q');
             delete $terminals{$id};
             }
         }
     }
+=reaper
+    # as a hack, we can reap "lost" sessions here
+     my @sessions=`ps x | grep pugs | grep -v runpugs | grep -v grep`;
+     for my $session (@sessions) {
+     chomp $session;
+       my $pid=$session;
+       $pid=~s/\s+.*$//;
+     }
+=cut
 }
 

misc/runpugs/lib/WebTerminal/Server/Terminal.pm

@@ -9 +9 @@
 write() sends commands to it.
 =cut
-
+$SIG{CHLD}='IGNORE';
 ## Constructor
 sub new {
@@ -25 +25 @@
         $self->{'pugs'} = new Net::Telnet(
                 -fhopen => $self->{'pty'},
-        -timeout => 20,
+        -timeout => 10,
                 -prompt => $prompt,
                 -telnetmode      => 0,
@@ -57 +57 @@
 
         $pugs->print($cmd);
-        while (1) {
+        while ($i<256) {
                 my $line = $pugs->getline;
         my $msg=$pugs->errmsg;
@@ -73 +73 @@
                 $i++;
         }
-
+    if ($i>=255) {
+     kill 9, $obj->{'pid'};
+     $lline.="Generated output is limited to 100 lines. Aborted.\npugs";
+    }
 
         #$lline .= "\n$ps>";