[haver-commits] r935 - in trunk: . perl/server/lib/Haver/Server

[haver]

Author: dylan
Date: 2005-11-22 14:34:00 -0500 (Tue, 22 Nov 2005)
New Revision: 935

Modified:
   trunk/
   trunk/perl/server/lib/Haver/Server/Talker.pm
Log:
Removed warning.
Now we just bork.


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/havercurs-objc:43089
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:11166
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk-merge-10131:11178
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/winch/trunk:43192
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
e9404bb1-7af0-0310-a7ff-e22194cd388b:/haver/local:1597
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238
   + 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/havercurs-objc:43089
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:11166
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk-merge-10131:11178
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/winch/trunk:43192
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
e9404bb1-7af0-0310-a7ff-e22194cd388b:/haver/local:1602
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238

Modified: trunk/perl/server/lib/Haver/Server/Talker.pm
===================================================================
--- trunk/perl/server/lib/Haver/Server/Talker.pm        2005-11-22 16:54:06 UTC 
(rev 934)
+++ trunk/perl/server/lib/Haver/Server/Talker.pm        2005-11-22 19:34:00 UTC 
(rev 935)
@@ -18,7 +18,7 @@
 sub states {
        return [qw(
                _start _stop _default
-               input error flush warn
+               input error flush 
                shutdown fail
        )];
 }
@@ -82,8 +82,15 @@
        return if $heap->{shutdown};
        
        unless (@$args) {
-               call('warn', 'empty');
-               return;
+               if ($heap->{version}) {
+                       call('shutdown', 'bork', 'Your line is empty');
+                       return;
+               } else {
+                       Log('warning', "My, isn't this a stupid one.");
+                       $heap->{error} = 1;
+                       $heap->{client} = undef;
+                       call('shutdown');
+               }
        }
        my $cmd = shift @$args;
        my $event = 'msg_' . $cmd;
@@ -100,17 +107,6 @@
        $heap->{client}->put(['FAIL', $heap->{cmd}, $err, @args]);
 }
 
-sub warn {
-       my ($kernel, $heap, $type) = @_[KERNEL, HEAP, ARG0];
-       if ($heap->{warnings}{$type} >= 3) {
-               call('shutdown', 'warned', $type,  $heap->{warnings}{$type});
-       } else {
-               $heap->{client}->put(['WARN', $type]);
-       }
-       $heap->{warnings}{$type}++;
-}
-
-
 sub error {
        my ($kernel, $heap, $operation, $errnum, $errstr) = @_[KERNEL, HEAP, 
ARG0..ARG3];
        my @why;