aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Weth <git@jonathanweth.de>2020-07-21 17:41:03 +0200
committerJonathan Weth <git@jonathanweth.de>2020-07-21 17:41:03 +0200
commitd0779461c5d84534aa3008ec6563ba33a41feac6 (patch)
tree9bcce2b2c7ce4b7906c33131f812ef23b590e5df
parent741d4498f76f743df42a7dfa7906700e9c754658 (diff)
parent885fe5d0f156b349504b9b0209afa893f4b65428 (diff)
downloadRWA.Support.SessionService-d0779461c5d84534aa3008ec6563ba33a41feac6.tar.gz
RWA.Support.SessionService-d0779461c5d84534aa3008ec6563ba33a41feac6.tar.bz2
RWA.Support.SessionService-d0779461c5d84534aa3008ec6563ba33a41feac6.zip
Merge branch 'master' of gitlab.das-netzwerkteam.de:remotewebapp/session-service
-rw-r--r--API.rst2
-rw-r--r--service.py10
-rw-r--r--test_client.py2
3 files changed, 7 insertions, 7 deletions
diff --git a/API.rst b/API.rst
index 34960f5..dd67cf1 100644
--- a/API.rst
+++ b/API.rst
@@ -4,7 +4,7 @@ API documentation for Session Service
General information
-------------------
-Bus name: ``de.rwa.rwa``
+Bus name: ``org.ArcticaProject.RWA``
Object name: ``/RWA``
diff --git a/service.py b/service.py
index 62f1117..21737ac 100644
--- a/service.py
+++ b/service.py
@@ -11,13 +11,13 @@ from session import Session
class RWAService(dbus.service.Object):
def __init__(self):
self.bus = dbus.SessionBus()
- name = dbus.service.BusName("de.rwa.rwa", bus=self.bus)
+ name = dbus.service.BusName("org.ArcticaProject.RWA", bus=self.bus)
self.update_service_running = False
self.sessions = {}
super().__init__(name, "/RWA")
- @dbus.service.method("de.rwa.rwa", out_signature="s")
+ @dbus.service.method("org.ArcticaProject.RWA", out_signature="s")
def start(self):
"""Start a new remote session."""
# Start session
@@ -31,18 +31,18 @@ class RWAService(dbus.service.Object):
return json.dumps(session.client_meta)
- @dbus.service.method("de.rwa.rwa", in_signature="i", out_signature="s")
+ @dbus.service.method("org.ArcticaProject.RWA", in_signature="i", out_signature="s")
def status(self, pid: int) -> str:
"""Get status information about a service."""
return self._get_status(pid)
- @dbus.service.method("de.rwa.rwa", in_signature="i", out_signature="s")
+ @dbus.service.method("org.ArcticaProject.RWA", in_signature="i", out_signature="s")
def refresh_status(self, pid: int) -> str:
"""Get status information about a service and refresh status before."""
self._update_session(pid)
return self._get_status(pid)
- @dbus.service.method("de.rwa.rwa", in_signature="i")
+ @dbus.service.method("org.ArcticaProject.RWA", in_signature="i")
def stop(self, pid: int):
"""Stop a remote session."""
session = self.sessions[pid]
diff --git a/test_client.py b/test_client.py
index cd7d338..927dfd3 100644
--- a/test_client.py
+++ b/test_client.py
@@ -3,7 +3,7 @@ import dbus
bus = dbus.SessionBus()
-time = bus.get_object("de.rwa.rwa", "/RWA")
+time = bus.get_object("org.ArcticaProject.RWA", "/RWA")
curr = time.start()