Clean up the client cleanup a little.

rcaputo · Apr 12, 2010 · 6c37951 · 6c37951
1 parent f1b098d
commit 6c37951
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/eg/eg-35-tcp-client.pl b/eg/eg-35-tcp-client.pl
@@ -10,19 +10,17 @@
 
 	after on_my_connected => sub {
 		my ($self, $args) = @_;
-		$self->server()->put("Hello, world!\n");
+		$self->connection()->put("Hello, world!\n");
 	};
 
-	sub on_server_stream {
+	sub on_connection_stream {
 		my ($self, $args) = @_;
 
 		# Not chomped.
 		warn "got from server: $args->{data}";
 
-		# Close the connection after we've got the echo.
-		# TODO - Moosey way to clear this?
-		# TODO - Socket shutdown?
-		$self->server(undef);
+		# Disconnect after we receive the echo.
+		$self->stop();
 	}
 }
 

diff --git a/lib/Reflex/Client.pm b/lib/Reflex/Client.pm
@@ -16,7 +16,7 @@ has protocol => (
 	default => 'Reflex::Stream',
 );
 
-has server => (
+has connection => (
 	is      => 'rw',
 	isa     => 'Maybe[Reflex::Stream]',
 	traits  => ['Reflex::Trait::Observer'],
@@ -27,7 +27,7 @@ sub on_my_connected {
 
 	$self->stop();
 
-	$self->server(
+	$self->connection(
 		$self->protocol()->new(
 			handle => $args->{socket},
 			rd     => 1,
@@ -38,22 +38,24 @@ sub on_my_connected {
 sub on_my_fail {
 	my ($self, $args) = @_;
 	warn "$args->{errfun} error $args->{errnum}: $args->{errstr}\n";
-
 	$self->stop();
 }
 
-sub on_server_close {
+sub on_connection_close {
 	my ($self, $args) = @_;
 	warn "server closed connection.\n";
-
-	$self->sever()->stop();
+	$self->stop();
 }
 
-sub on_server_fail {
+sub on_connection_fail {
 	my ($self, $args) = @_;
 	warn "$args->{errfun} error $args->{errnum}: $args->{errstr}\n";
-
-	$self->server()->stop();
+	$self->stop();
 }
 
+after stop => sub {
+	my $self = shift;
+	$self->connection(undef);
+};
+
 1;