Merge pull request #94 from rundeck-plugins/rse321-os-uses-different-…

…charset-than-scripts

RSE-321: Fix: ERROR while running a dir command in a path with Japanese files

contents/winrm-exec.py

@@ -209,7 +209,8 @@ def filter(self, record):
     else:
         krbdelegation = False
 
-output_charset = "utf-8"
+DEFAULT_CHARSET = 'utf-8'
+output_charset = DEFAULT_CHARSET
 if "RD_NODE_OUTPUT_CHARSET" in os.environ:
     output_charset = os.getenv("RD_NODE_OUTPUT_CHARSET")
 
@@ -300,15 +301,23 @@ def filter(self, record):
 while True:
     t.join(.1)
 
-    if sys.stdout.tell() != lastpos:
-        sys.stdout.seek(lastpos)
-        read=sys.stdout.read()
-        if isinstance(read, str):
-            realstdout.write(read)
-        else:
-            realstdout.write(read.decode(output_charset))
-
-        lastpos = sys.stdout.tell()
+    try:
+        if sys.stdout.tell() != lastpos:
+            sys.stdout.seek(lastpos)
+            read=sys.stdout.read()
+            if isinstance(read, str):
+                realstdout.write(read)
+            else:
+                realstdout.write(read.decode(output_charset))
+    except UnicodeDecodeError:
+        try:
+            realstdout.write(read.decode(DEFAULT_CHARSET))
+        except Exception as e:
+            log.error(e)
+    except Exception as e:
+        log.error(e)
+
+    lastpos = sys.stdout.tell()
 
     if not t.is_alive():
         break
@@ -318,8 +327,6 @@ def filter(self, record):
 sys.stdout = realstdout
 sys.stderr = realstderr
 
-
-
 if exitBehaviour == 'console':
     if tsk.e_std:
         log.error("Execution finished with the following error")