views: fix handling of View.is_daemon

This patch fixes a regression, introduced in:

	c325458 ("views: add daemonizing support for short running views")

c325458 changed the checks, if a view runtime should be removed from the
server, to make short running deamon-views possible.

When `View.STOP_DAEMON_WHEN_VIEW_FINISHES` was set to `False` and
`View.is_daemon` to `True`, the runtime did not get removed from the server,
when the user closed the tab, and got reconnected, to the same runtime, when
reopening the tab.

When `View.STOP_DAEMON_WHEN_VIEW_FINISHES` was set to `True`, which is the
default, and `View.is_daemon` to `True`, the view should be removed from the
server, when it finishes, and the tab got closed, but instead the runtime
remained on the server, but was not reconnected when reopening the tab.

That meant that the server created a new view runtime on every access of a
page, and did neither reuse or close it, so they built up indefinitely.

This patch fixes this issue, by adding a check to
`ViewRuntime.remove_connection`, if `STOP_DAEMON_WHEN_VIEW_FINISHES` is set,
when the last connection to the runtime gets closed. In this case the runtime
gets removed from the server.

Signed-off-by: Florian Scherf <[email protected]>

lona/view_runtime.py

@@ -120,6 +120,14 @@ def __init__(
         self.stop_reason = None
         self.is_daemon = False
 
+        # TODO: remove in 2.0
+        # compatibility for older Lona application code
+        self.stop_daemon_when_view_finishes = getattr(
+            self.view,
+            'STOP_DAEMON_WHEN_VIEW_FINISHES',
+            self.server.settings.STOP_DAEMON_WHEN_VIEW_FINISHES,
+        )
+
         self.view_runtime_id = generate_unique_id(name_space='view_runtimes')
         self.state = VIEW_RUNTIME_STATE.NOT_STARTED
         self.thread_ident = None
@@ -474,7 +482,10 @@ def remove_connection(self, connection, window_id=None):
 
             # if the last connection gets closed and the view should
             # not continue running in background, it gets stopped
-            if not self.connections and not self.is_daemon:
+            if (not self.connections and
+                    self.stop_daemon_when_view_finishes and
+                    not self.is_daemon):
+
                 self.stop()
 
     # lona messages ###########################################################

lona/view_runtime_controller.py

@@ -48,15 +48,9 @@ def get_running_view_runtime(self, user, route, match_info):
 
                 continue
 
-            # TODO: remove in 2.0
-            # compatibility for older Lona application code
-            stop_daemon_when_view_finishes = getattr(
-                view_runtime.view,
-                'STOP_DAEMON_WHEN_VIEW_FINISHES',
-                self.server.settings.STOP_DAEMON_WHEN_VIEW_FINISHES,
-            )
+            if (view_runtime.stop_daemon_when_view_finishes and
+                    view_runtime.is_stopped):
 
-            if stop_daemon_when_view_finishes and view_runtime.is_stopped:
                 continue
 
             return view_runtime