Fixed counting of active requests/connections/websockets

Author: Mons

lib/AnyEvent/HTTP/Server.pm

@@ -66,6 +66,8 @@ sub new {
 		request   => 'AnyEvent::HTTP::Server::Req',
 		sockets => {},
 		@_,
+		active_requests => 0,
+		active_connections => 0,
 	}, $pkg;
 
 	eval qq{ use $self->{request}; 1}
@@ -227,8 +229,18 @@ sub drop {
 	$self->{active_connections}--;
 	%{ $r } = () if $r;
 
-	( delete $self->{graceful} )->()
-		if $self->{graceful} and $self->{active_requests} == 0;
+	if ($self->{graceful} ) {
+		if (
+			$self->{active_requests} == 0
+			# and $self->{active_connections} == 0
+			and 0+keys %{ $self->{wss} } == 0
+		) {
+			( delete $self->{graceful} )->();
+		}
+		else {
+			warn "wait for $self->{active_requests} / @{[ 0+keys %{ $self->{wss} } ]} for graceful shutdown";
+		}
+	}
 }
 
 sub req_wbuf_len {
@@ -416,7 +428,6 @@ sub incoming {
 									reqcount => \$self->{active_requests},
 									server   => $self,
 									version  => $version,
-									# guard   => guard { $self->{active_requests}--; },
 								);
 								my @rv = $self->{cb}->($req);
 								#my @rv = $self->{cb}->( $req = bless [ $method, $uri, \%h, $write ], 'AnyEvent::HTTP::Server::Req' );
@@ -572,7 +583,11 @@ sub incoming {
 										$req->handle($h);
 										$rv[1]->($h);
 										$h->{__cnn_drop_guard} = guard {
-											$self->drop($id) if $self;
+											# use postpone to unroll destruction loop
+											# waiting for request to decrement active_resuests
+											AE::postpone {
+												$self->drop($id) if $self;
+											};
 										};
 										weaken($req);
 										%r = ( );
@@ -681,17 +696,24 @@ sub ws_close {
 	for (values %{ $self->{wss} }) {
 		$_ && $_->close();
 	}
-	warn "$self->{active_requests} / $self->{active_connections}";
 }
 
 sub graceful {
 	my $self = shift;
 	my $cb = pop;
 	delete $self->{aws};
 	close $_ for values %{ $self->{fhs} };
-	if ($self->{active_requests} == 0 or $self->{active_connections} == 0) {
+
+	warn "Graceful shutdown: req=$self->{active_requests} / cnn=$self->{active_connections} / wss=@{[ 0+keys %{ $self->{wss} } ]}\n";# if DEBUG or $self->{debug};
+	
+	if (
+		$self->{active_requests} == 0
+		# and $self->{active_connections} == 0
+		and 0+keys %{ $self->{wss} } == 0
+	) {
 		$cb->();
-	} else {
+	}
+	else {
 		$self->{graceful} = $cb;
 		$self->ws_close();
 	}

lib/AnyEvent/HTTP/Server/Req.pm

@@ -288,7 +288,6 @@ BEGIN {
 				}
 				$self->{writer}->( \undef ) if $h->{connection} eq 'close' or $self->server->{graceful};
 				delete $self->{writer};
-				${ $self->{reqcount} }--;
 			}
 		}
 
@@ -398,7 +397,6 @@ BEGIN {
 				$self->{writer}->( \$reply );
 				$self->{writer}->( \undef ) if $h->{connection} eq 'close' or $self->server->{graceful};
 				delete $self->{writer};
-				${ $self->{reqcount} }--;
 			}
 			if( $self->server && $self->server->{on_reply} ) {
 				$h->{ResponseTime} = AE::now() - $self->reqtime;
@@ -448,14 +446,18 @@ BEGIN {
 				} );
 
 				${ $self->{reqcount} }--;
+				$self->{reqcount} = undef;
 
 				my $create_ws = sub {
 					my $h = shift;
 					my $ws = AnyEvent::HTTP::Server::WS->new(
-						%args, h => $h,
+						%args,
+						h => $h,
+						server => $self->server,
 					);
 					weaken( $self->server->{wss}{ 0+$ws } = $ws );
-					@$self = ();
+					
+					%$self = ();
 					$cb->($ws);
 				};
 
@@ -539,7 +541,6 @@ BEGIN {
 				undef $self->{chunked};
 			}
 			elsif(defined $self->{chunked}) {
-				${ $self->{reqcount} }--;
 				# warn "sent body with non-chunked (wr=$self->{writer}) (".$self->connection.")\n";
 				if( $self->{writer} ) {
 					$self->{writer}->(\undef) if $self->connection eq 'close' or $self->server->{graceful};
@@ -572,7 +573,6 @@ BEGIN {
 				}
 			}
 			elsif (defined $self->{chunked}) {
-				${ $self->{reqcount} }--;
 				undef $self->{chunked};
 			}
 			else {
@@ -624,6 +624,9 @@ BEGIN {
 				warn "[E] finish or abort was not called for ".( $self->{chunked} ? "chunked" : "partial" )." response";
 				$self->abort;
 			}
+			if ($self->{reqcount}) {
+				${ $self->{reqcount} }--;
+			}
 			%$self = ();
 		}
 

lib/AnyEvent/HTTP/Server/WS.pm

@@ -392,6 +392,7 @@ sub DESTROY {
 		});
 	}
 	#warn "Destroy ws $self by $caller";
+	delete $self->{server}{wss}{ 0+$self };
 	%$self = ();
 }