Fixed session_info update on session_destroy

panel/tests/test_server.py

@@ -3,9 +3,11 @@
 
 from tempfile import NamedTemporaryFile
 
+import param
 import pytest
 import requests
 
+from panel.config import config
 from panel.io import state
 from panel.models import HTML as BkHTML
 from panel.pane import Markdown
@@ -57,6 +59,38 @@ def test_server_static_dirs():
     server.stop()
 
 
+def test_server_session_info():
+    with config.set(session_history=-1):
+        html = Markdown('# Title')
+
+        server = serve(html, port=5009, threaded=True, show=False)
+
+        # Wait for server to start
+        time.sleep(1)
+
+        requests.get("http://localhost:5009/")
+
+        assert state.session_info['total'] == 1
+        assert len(state.session_info['sessions']) == 1
+        sid, session = list(state.session_info['sessions'].items())[0]
+        assert session['user_agent'].startswith('python-requests')
+        assert state.session_info['live'] == 0
+
+        doc = list(html._documents.keys())[0]
+        session_context = param.Parameterized()
+        session_context._document = doc
+        session_context.id = sid
+        doc._session_context = session_context
+        state.curdoc = doc
+        state._init_session(None)
+        assert state.session_info['live'] == 1
+
+    server.stop()
+    state.curdoc = None
+    html._server_destroy(session_context)
+    assert state.session_info['live'] == 0
+
+
 def test_show_server_info(html_server_session, markdown_server_session):
     server_info = repr(state)
     assert "localhost:5006 - HTML" in server_info

panel/tests/test_template.py

@@ -69,9 +69,7 @@ def test_template_session_destroy(document, comm):
     tmplt._init_doc(document, comm, notebook=True)
     session_context = param.Parameterized()
     session_context._document = document
-    session = param.Parameterized()
-    session.id = 'Some ID'
-    session_context.session = session
+    session_context.id = 'Some ID'
 
     assert len(widget._models) == 2
     assert len(row._models) == 2

panel/viewable.py

@@ -442,12 +442,11 @@ def _server_destroy(self, session_context):
         """
         Server lifecycle hook triggered when session is destroyed.
         """
-        session_id = session_context.session.id
+        session_id = session_context.id
         sessions = state.session_info['sessions']
-        if session_id in sessions and sessions['ended'] is None:
-            session_info = sessions[session_id]
+        if session_id in sessions and sessions[session_id]['ended'] is None:
             state.session_info['live'] -= 1
-            session_info.update({
+            sessions[session_id].update({
                 'ended': dt.datetime.now().timestamp()
             })
         doc = session_context._document