Logging only in /var/log/magiback

3 files changed, 46 insertions, 5 deletions

diff --git a/backend/magiback b/backend/magiback
index e16e1dc..d46ee9a 100755
--- a/backend/magiback
+++ b/backend/magiback
@@ -222,11 +222,46 @@ class ConfFile(object):
             return True
 
 
+class Logging(object):
+    """
+		<node>
+			<interface name='org.mageia.Magiback.Logging'>
+				<method name='debug'>
+					<arg type='s' name='message' direction='in'/>
+				</method>
+				<method name='info'>
+					<arg type='s' name='message' direction='in'/>
+				</method>
+				<method name='warning'>
+					<arg type='s' name='message' direction='in'/>
+				</method>
+				<method name='error'>
+					<arg type='s' name='message' direction='in'/>
+				</method>
+			</interface>
+		</node>
+    """
+    def __init__(self):
+        super().__init__()
+
+    def debug(self, message):
+        logging.debug(message)
+
+    def info(self, message):
+        logging.info(message)
+
+    def warning(self, message):
+        logging.warning(message)
+
+    def error(self, message):
+        logging.error(message)
+
 if __name__ == '__main__':
     print("Running Magiback service.")
     bus = SystemBus()
     conf_file = ConfFile()
-    bus.publish(DEAMON_ORG, conf_file, ("Isodumper", Isodumper()))
+    log = Logging()
+    bus.publish(DEAMON_ORG, conf_file, ("Isodumper", Isodumper()), ('Logging', Logging()))
     loop = GLib.MainLoop()
     loop.run()
     logging.shutdown()
diff --git a/backend/org.mageia.Magiback.conf b/backend/org.mageia.Magiback.conf
index af00707..4632805 100644
--- a/backend/org.mageia.Magiback.conf
+++ b/backend/org.mageia.Magiback.conf
@@ -19,4 +19,8 @@
         <allow send_destination="org.mageia.Magiback.Isodumper"/>
         <allow send_interface="org.mageia.Magiback.Isodumper"/>
     </policy>
+    <policy context="default">
+        <allow send_destination="org.mageia.Magiback.Logging"/>
+        <allow send_interface="org.mageia.Magiback.Logging"/>
+    </policy>
 </busconfig>
diff --git a/backend/raw_write.py b/backend/raw_write.py
index b30f759..d46fe1e 100755
--- a/backend/raw_write.py
+++ b/backend/raw_write.py
@@ -131,6 +131,7 @@ class Dumper(object):
     def _check_write(self, target, source):
         logging.debug("Start checking")
         self.return_message = ""
+        messages = []
         b = os.path.getsize(source)
         # Compute the sum from the written device
         steps = list(range(0, b + 1, int(b / 100)))
@@ -165,17 +166,18 @@ class Dumper(object):
             self.sum_file = False
         self.return_state = True
         if self.sum_check == "":  # Can't get stored sum
-            self.return_message += _("SHA3 sum: {}").format(sha512sumcalc)
+            messages.append(_("SHA3 sum: {}").format(sha512sumcalc))
         #  compare the sums
         elif sha512sumcalc == self.sum_check:
             # ,  keep the bracket, this is the place for sum type
-            self.return_message += "\n" + _("The {} sum check is OK").format(sum_type)
+            messages.append(_("The {} sum check is OK").format(sum_type))
         else:
-            self.return_message += "\n" + _(
-                "/!\\The computed and stored sums don't match"
+            messages.append(
+                _("/!\\The computed and stored sums don't match")
             )
             self.return_state = False
         self._progress = 100
+        self.return_message = "\n".join(messages)
         logging.info(self.return_message)
         self.finished.set()