Commit 3392d393 authored by Bas Lijnse's avatar Bas Lijnse

Merge branch 'remove-connectedTo' into 'master'

Allow viewports to connect directly to a toplevel task

See merge request !434
parents 9a2eac83 898a64a7
Pipeline #43906 passed with stage
in 8 minutes and 13 seconds
......@@ -53,7 +53,7 @@ where
(Ok (),iworld) = checkAll f xs iworld
(Error e,iworld) = (Error e,iworld)
removeIfOutdated options {TaskMeta|taskId=TaskId instanceNo _,connectedTo,lastIO,build,createdAt} iworld=:{options={appVersion},clock=tNow}
removeIfOutdated options {TaskMeta|taskId=TaskId instanceNo _,lastIO,build,createdAt} iworld=:{options={appVersion},clock=tNow}
| if (lastIO =:(Just _))
(tNow - fromJust lastIO > options.EngineOptions.sessionTime)
((build <> appVersion) || (tNow - createdAt > options.EngineOptions.sessionTime))
......
......@@ -63,7 +63,7 @@ where
// Determine the task type (startup,session,local)
# (type,iworld) = determineInstanceType instanceNo iworld
// Determine the progress of the instance
# (curProgress=:{TaskMeta|nextTaskTime,nextTaskNo,status,attachedTo},iworld) = determineInstanceProgress instanceNo iworld
# (curProgress=:{TaskMeta|nextTaskTime,nextTaskNo,status,attachedTo,connectedTo},iworld) = determineInstanceProgress instanceNo iworld
//Check exception
| status =: (Left _) = let (Left message) = status in exitWithException instanceNo message iworld
//Evaluate instance
......@@ -113,7 +113,7 @@ where
= case newResult of
ValueResult value _ change _
| destroyed = (Ok value,iworld)
| isNothing currentSession = (Ok value, iworld)
| isNothing currentSession && isNothing connectedTo = (Ok value, iworld)
| otherwise = case (compactUIChange change, syncCookies) of
//Only queue output if something interesting is changed
(NoChange,[]) = (Ok value,iworld)
......
......@@ -66,7 +66,7 @@ derive gText ExtendedTaskListFilter
, instanceKey :: !Maybe InstanceKey //* Random token that a client gets to have (temporary) access to the task instance
, taskAttributes :: !TaskAttributes //* Attributes computed by the UI
//IO information
, connectedTo :: !Maybe String //* Client machine to which this task is connected
, connectedTo :: !Maybe String //* The IP address of the client to which the task is connected
, firstEvent :: !Maybe Timespec //* When was the first work done on this task
, lastEvent :: !Maybe Timespec //* When was the latest event on this task (excluding Refresh events)
, lastIO :: !Maybe Timespec //* Last network event or ping
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment