aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Weth <mail@jonathanweth.de>2020-07-21 17:06:34 +0200
committerJonathan Weth <mail@jonathanweth.de>2020-07-21 17:06:34 +0200
commit885fe5d0f156b349504b9b0209afa893f4b65428 (patch)
tree8777d359fc3c33059e9b10f2d8b9c6f58a7984aa
parent4eb1dc6b06867a1f1906fa32ab6448d0a00b9700 (diff)
parentfbb8a582edec8c8bdd4e8801f063e81f36344527 (diff)
downloadRWA.Support.SessionService-885fe5d0f156b349504b9b0209afa893f4b65428.tar.gz
RWA.Support.SessionService-885fe5d0f156b349504b9b0209afa893f4b65428.tar.bz2
RWA.Support.SessionService-885fe5d0f156b349504b9b0209afa893f4b65428.zip
Merge branch 'pr/namespace-to-arctica' into 'master'
Port namespace to Arctica Project See merge request remotewebapp/session-service!1
-rw-r--r--API.rst2
-rw-r--r--service.py6
-rw-r--r--test_client.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/API.rst b/API.rst
index d9b2698..770027a 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 6125a75..da6a8ca 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,7 +31,7 @@ class RWAService(dbus.service.Object):
return json.dumps(session.client_meta)
- @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()