handle session close in ProxySession::timeout()

sozu-proxy · Jul 13, 2022 · c573f40 · c573f40
1 parent 6c2da60
commit c573f40
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 15 deletions.
diff --git a/lib/src/http.rs b/lib/src/http.rs
@@ -1190,8 +1190,8 @@ impl ProxySession for Session {
             .try_remove(self.frontend_token.0);
     }
 
-    fn timeout(&mut self, token: Token) -> SessionResult {
-        match *unwrap_msg!(self.protocol.as_mut()) {
+    fn timeout(&mut self, token: Token) {
+        let res = match *unwrap_msg!(self.protocol.as_mut()) {
             State::Expect(_) => {
                 if token == self.frontend_token {
                     self.front_timeout.triggered();
@@ -1200,6 +1200,10 @@ impl ProxySession for Session {
             }
             State::Http(ref mut http) => http.timeout(token, &mut self.metrics),
             State::WebSocket(ref mut pipe) => pipe.timeout(token, &mut self.metrics),
+        };
+
+        if res == SessionResult::CloseSession {
+            self.close();
         }
     }
 

diff --git a/lib/src/https_openssl.rs b/lib/src/https_openssl.rs
@@ -1318,8 +1318,8 @@ impl ProxySession for Session {
         }
     }
 
-    fn timeout(&mut self, token: Token) -> SessionResult {
-        match *unwrap_msg!(self.protocol.as_mut()) {
+    fn timeout(&mut self, token: Token) {
+        let res = match *unwrap_msg!(self.protocol.as_mut()) {
             State::Expect(_, _) => {
                 if token == self.frontend_token {
                     self.front_timeout.triggered();
@@ -1338,6 +1338,10 @@ impl ProxySession for Session {
             //FIXME: not implemented yet
             State::Http2(_) => SessionResult::CloseSession,
             State::Http(ref mut http) => http.timeout(token, &mut self.metrics),
+        };
+
+        if res == SessionResult::CloseSession {
+            self.close();
         }
     }
 

diff --git a/lib/src/https_rustls/session.rs b/lib/src/https_rustls/session.rs
@@ -1237,8 +1237,8 @@ impl ProxySession for Session {
         }
     }
 
-    fn timeout(&mut self, token: Token) -> SessionResult {
-        match *unwrap_msg!(self.protocol.as_mut()) {
+    fn timeout(&mut self, token: Token) {
+        let res = match *unwrap_msg!(self.protocol.as_mut()) {
             State::Http(ref mut http) => http.timeout(token, &mut self.metrics),
             State::WebSocket(ref mut pipe) => pipe.timeout(token, &mut self.metrics),
             _ => {
@@ -1248,6 +1248,10 @@ impl ProxySession for Session {
 
                 SessionResult::CloseSession
             }
+        };
+
+        if res == SessionResult::CloseSession {
+            self.close();
         }
     }
 

diff --git a/lib/src/lib.rs b/lib/src/lib.rs
@@ -255,7 +255,7 @@ pub trait ProxySession {
     fn close(&mut self);
     /// if a timeout associated with the session triggers, the event loop will
     /// call this method with the timeout's token
-    fn timeout(&mut self, t: Token) -> SessionResult;
+    fn timeout(&mut self, t: Token);
     /// last time the session got an event
     fn last_event(&self) -> Instant;
     /// displays the session's internal state (for debugging purpose)

diff --git a/lib/src/server.rs b/lib/src/server.rs
@@ -1720,10 +1720,9 @@ impl Server {
 
         let session_token = token.0;
         if self.sessions.borrow().slab.contains(session_token) {
-            let order = self.sessions.borrow_mut().slab[session_token]
+            self.sessions.borrow_mut().slab[session_token]
                 .borrow_mut()
                 .timeout(token);
-            self.interpret_session_order(SessionToken(session_token), order);
         }
     }
 
@@ -1783,12 +1782,11 @@ impl ProxySession for ListenSession {
 
     fn close(&mut self) {}
 
-    fn timeout(&mut self, _token: Token) -> SessionResult {
+    fn timeout(&mut self, _token: Token) {
         error!(
             "called ProxySession::timeout(token={:?}, time) on ListenSession {{ protocol: {:?} }}",
             _token, self.protocol
         );
-        SessionResult::CloseSession
     }
 }
 

diff --git a/lib/src/tcp.rs b/lib/src/tcp.rs
@@ -919,21 +919,19 @@ impl ProxySession for Session {
         }
     }
 
-    fn timeout(&mut self, token: Token) -> SessionResult {
+    fn timeout(&mut self, token: Token) {
         if self.frontend_token == token {
             let dur = Instant::now() - self.last_event;
             let front_timeout = self.front_timeout.duration();
             if dur < front_timeout {
                 TIMER.with(|timer| {
                     timer.borrow_mut().set_timeout(front_timeout - dur, token);
                 });
-                SessionResult::Continue
             } else {
-                SessionResult::CloseSession
+                self.close();
             }
         } else {
             // invalid token, obsolete timeout triggered
-            SessionResult::Continue
         }
     }