From 4edae3f518353bb21a02fcda2dfcff83c5a72fc3 Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Thu, 26 Jan 2012 12:08:39 +0100
Subject: New onCommit scripting system.

---
 server/src/session.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'server/src/session.h')

diff --git a/server/src/session.h b/server/src/session.h
index 4d1ed12..85382f5 100644
--- a/server/src/session.h
+++ b/server/src/session.h
@@ -37,6 +37,9 @@
 #include "transaction.h"
 #include "template.h"
 
+#include "luascript.h"
+#include "journal.h"
+
 class Environment;
 class Journal;
 
@@ -52,7 +55,7 @@ public:
   void lock();
   void unlock();
 
-  void commit();
+  void commit() throw(LUAScript::Exception, Journal::Exception);
   void nocommit();
   void discard();
 
-- 
cgit v1.2.3


From ddd6826b161e2bb7735b152c15c9ba9bab79aa29 Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Thu, 23 Feb 2012 10:41:20 +0100
Subject: Remove deadlock in session store.

---
 server/src/session.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'server/src/session.h')

diff --git a/server/src/session.h b/server/src/session.h
index 85382f5..9ad84b5 100644
--- a/server/src/session.h
+++ b/server/src/session.h
@@ -53,6 +53,7 @@ public:
   std::string id();
   
   void lock();
+  bool trylock();
   void unlock();
 
   void commit() throw(LUAScript::Exception, Journal::Exception);
-- 
cgit v1.2.3


From 72b7d402e36ac2235e89c3b099a634f3fb5e5770 Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Thu, 1 Mar 2012 15:36:13 +0100
Subject: activeSessions rewrite to prevent deadlock.

---
 server/src/session.h | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'server/src/session.h')

diff --git a/server/src/session.h b/server/src/session.h
index 9ad84b5..1cb3041 100644
--- a/server/src/session.h
+++ b/server/src/session.h
@@ -132,7 +132,17 @@ public:
   //
   // Admin methods
   //
-  std::vector<std::string> activeSessions();
+  class SessionInfo {
+  public:
+    std::string id;
+    std::string patientid;
+    std::string user;
+    std::string course;
+    std::string templ;
+    bool idle;
+    bool ondisc;
+  };
+  std::vector<SessionInfo> activeSessions();
 
 private:
   std::map<std::string, Session *> sessions;
-- 
cgit v1.2.3