get fs.pl up to date

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4140 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/scripts/socket/FreeSWITCH/Client.pm b/scripts/socket/FreeSWITCH/Client.pm
index 41bfbad23828eecf405c87025aa6baf53acd23a0..26d237eb5aee913191132a01c906e192f00afbcc 100644 (file)
--- a/scripts/socket/FreeSWITCH/Client.pm
+++ b/scripts/socket/FreeSWITCH/Client.pm
@@ -112,7 +112,6 @@ sub sendmsg($$$) {
   for(;;) {
     $e = $self->readhash(.1);
     if ($e && !$e->{socketerror}) {
-      #print Dumper $e;
       push @{$self->{events}}, $e;
     } else  {
       last;

diff --git a/scripts/socket/fs.pl b/scripts/socket/fs.pl
index 0c6b3b6bf28aa072fc6bb77039b4561bf159a47f..61ee4dd237af2384528b5e6969eb0b07c2431b37 100644 (file)
--- a/scripts/socket/fs.pl
+++ b/scripts/socket/fs.pl
@@ -6,8 +6,9 @@ my $password = "ClueCon";
 
 my $fs = init FreeSWITCH::Client {-password => $password} or die "Error $@";
 my $term = new Term::ReadLine "FreeSWITCH CLI";
-my $prompt = "FS>";
+my $prompt = "\e[mFreeSWITCH>";
 my $OUT = $term->OUT .. \*STDOUT;
+my $pid;
 
 my $log = shift;
 
@@ -19,44 +20,38 @@ if ($log) {
     my $fs2 = init FreeSWITCH::Client {-password => $password} or die "Error $@";
     
 
-    $fs2->cmd({ command => "log $log" });
+    $fs2->sendmsg({ 'command' => "log $log" });
     while (1) {
       my $reply = $fs2->readhash(undef);
       if ($reply->{socketerror}) {
        die "socket error";
       }
+      
       if ($reply->{body}) {
-       print $reply->{body} . "\n";
-      } elsif ($reply->{'reply-text'}) {
-       print $reply->{'reply-text'} . "\n";
-      }
+       print $reply->{body};
+      } 
     }
     exit;
   }
 
 }
 
-
-
 while ( defined ($_ = $term->readline($prompt)) ) {
-  my $reply;
-
   if ($_) {
-    my $reply = $fs->cmd({command => "api $_"});
+    if ($_ =~ /exit/) {
+      last;
+    }
+    my $reply = $fs->command($_);
     if ($reply->{socketerror}) {
       $fs2->disconnect();
       die "socket error";
     }
-    if ($reply->{body}) {
-      print $reply->{body};
-    } elsif ($reply->{'reply-text'}) {
-      print $reply->{'reply-text'};
-    }
-    print "\n";
-    if ($_ =~ /exit/) {
-      last;
-    }
+    print "$reply\n";
+    
   }
   $term->addhistory($_) if /\S/;
 }
   
+if ($pid) {
+  kill 9 => $pid;
+}