joblog.txt -> job.log

- removed unessary newlines
- skip lines with can't be encoded as strings

2 files changed, 9 insertions, 5 deletions

diff --git a/bareos/fuse/node/job.py b/bareos/fuse/node/job.py
index 930921f..6bbc2cb 100644
--- a/bareos/fuse/node/job.py
+++ b/bareos/fuse/node/job.py
@@ -42,5 +42,5 @@ class Job(Directory):
 
     def do_update(self):
         self.add_subnode(File, name="info.txt", content = pformat(self.job) + "\n")
-        self.add_subnode(JobLog, self.job)
+        self.add_subnode(JobLog, name="job.log", job=self.job)
         self.add_subnode(BvfsDir, "data", self.job['jobid'], None)
diff --git a/bareos/fuse/node/joblog.py b/bareos/fuse/node/joblog.py
index e8b9122..e4249bb 100644
--- a/bareos/fuse/node/joblog.py
+++ b/bareos/fuse/node/joblog.py
@@ -5,14 +5,14 @@ Bareos specific Fuse node.
 from   bareos.fuse.node.file import File
 
 class JobLog(File):
-    def __init__(self, root, job):
-        super(JobLog, self).__init__(root, "joblog.txt")
+    def __init__(self, root, name, job):
+        super(JobLog, self).__init__(root, name)
         self.job = job
         if job['jobstatus'] == 'T' or job['jobstatus'] == 'E' or job['jobstatus'] == 'W':
             self.set_static()
 
     @classmethod
-    def get_id(cls, job):
+    def get_id(cls, name, job):
         return job['jobid']
 
     def do_update(self):
@@ -21,4 +21,8 @@ class JobLog(File):
         self.content = ""
         for i in data['joblog']:
             self.content += str(i['time']) + " "
-            self.content += str(i['logtext']) + "\n"
+            try:
+                self.content += str(i['logtext'])
+            except UnicodeEncodeError as e:
+                self.logger.error("failed to convert logtext to string: %s" % (str(e)))
+                self.content += "BAREOFSFS SKIPPED: converting error\n"