[haver-commits] r893 - in trunk: . perl/core/lib/Haver perl/core/t perl/server/lib/Haver/Server

[haver]

Author: dylan
Date: 2005-07-26 16:13:00 -0400 (Tue, 26 Jul 2005)
New Revision: 893

Modified:
   trunk/
   trunk/perl/core/lib/Haver/Session.pm
   trunk/perl/core/t/004_session.t
   trunk/perl/server/lib/Haver/Server/Talker.pm
Log:
* added the bit about lower-casing the hostname and username.
* I think I fixed the timing bug.
* call() and post() sugar.



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:1297
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:1314
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238

Modified: trunk/perl/core/lib/Haver/Session.pm
===================================================================
--- trunk/perl/core/lib/Haver/Session.pm        2005-07-24 22:01:32 UTC (rev 
892)
+++ trunk/perl/core/lib/Haver/Session.pm        2005-07-26 20:13:00 UTC (rev 
893)
@@ -6,7 +6,7 @@
 
 use Haver::Base -base;
 use Haver::Logger 'Log';
-use POE::Session;
+use POE;
 
 our $VERSION = 0.08;
 our @EXPORT_BASE = qw(
@@ -17,7 +17,7 @@
        ARG1 ARG2 ARG3
        ARG4 ARG5 ARG6
        ARG7 ARG8 ARG9
-       Log
+       Log call post
 );
 
 
@@ -29,6 +29,14 @@
        shift->SUPER::import(-package => $package, @_);
 }
 
+sub call (@) {
+       $poe_kernel->call($poe_kernel->get_active_session, @_);
+}
+
+sub post (@) {
+       $poe_kernel->yield( @_);
+}
+
 sub create () {
        my $this = shift;
        my $what = ref $this ? 'object' : 'package';

Modified: trunk/perl/core/t/004_session.t
===================================================================
--- trunk/perl/core/t/004_session.t     2005-07-24 22:01:32 UTC (rev 892)
+++ trunk/perl/core/t/004_session.t     2005-07-26 20:13:00 UTC (rev 893)
@@ -48,7 +48,7 @@
                my ($kernel, $heap, $opt) = @_[KERNEL, HEAP, ARG0];
                $heap->{count} = $opt->{count};
                $heap->{looped} = 0;
-               $kernel->yield('loop');
+               post('loop');
                diag "Starting with a count of $heap->{count}";
                ok(($_[OBJECT] eq 'MySession'), "Are we a package state?");
                diag $_[OBJECT];
@@ -58,7 +58,7 @@
                my ($kernel, $heap) = @_[KERNEL, HEAP];
                if ($heap->{count}-- > 0) {
                        $heap->{looped}++;
-                       $kernel->yield('loop');
+                       post('loop');
                }
        }
 

Modified: trunk/perl/server/lib/Haver/Server/Talker.pm
===================================================================
--- trunk/perl/server/lib/Haver/Server/Talker.pm        2005-07-24 22:01:32 UTC 
(rev 892)
+++ trunk/perl/server/lib/Haver/Server/Talker.pm        2005-07-26 20:13:00 UTC 
(rev 893)
@@ -65,10 +65,10 @@
                        Log('warning', 'Probably a search engine...');
                        $heap->{error} = 1;
                        $heap->{client} = undef;
-                       $kernel->yield('shutdown');
+                       post('shutdown');
                } else {
                        Log('warning', "Client isseud unknown command $cmd");
-                       $kernel->yield('fail', 'unknown.cmd');
+                       post('fail', 'unknown.cmd');
                }
        }
 
@@ -87,8 +87,8 @@
        
        Log('info', "Command: '$cmd'");
        $heap->{cmd} = $cmd;
-       $kernel->call($session, 'schedule_ping');
-       $kernel->call($session, $event, $args, $cmd);
+       call('schedule_ping');
+       post($event, $args, $cmd);
 }
 
 sub fail {
@@ -112,7 +112,7 @@
        
        $heap->{error} = 1;
        delete $heap->{client};
-       $kernel->yield('shutdown', @why);
+       post('shutdown', @why);
 }