From 61232d05dd8c3bf0b75013945579f357638acf82 Mon Sep 17 00:00:00 2001
From: allegroai <>
Date: Sun, 22 Mar 2020 19:16:11 +0200
Subject: [PATCH] Fix run as user support in Windows and add fall-back for
 created user folders

---
 trains_agent/commands/worker.py  | 16 +++++++++++-----
 trains_agent/helper/singleton.py |  4 ++++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/trains_agent/commands/worker.py b/trains_agent/commands/worker.py
index 524d79e..b460f65 100644
--- a/trains_agent/commands/worker.py
+++ b/trains_agent/commands/worker.py
@@ -17,7 +17,7 @@ from datetime import datetime
 from distutils.spawn import find_executable
 from functools import partial
 from itertools import chain
-from tempfile import mkdtemp
+from tempfile import mkdtemp, gettempdir
 from time import sleep, time
 from typing import Text, Optional, Any, Tuple
 
@@ -2066,14 +2066,20 @@ class Worker(ServiceCommandSection):
                 os.setuid(self.uid)
 
         # create a home folder for our user
+        trains_agent_home = 'trains_agent_home{}'.format('.'+str(Singleton.get_slot()) if Singleton.get_slot() else '')
         try:
-            home_folder = '/trains_agent_home'
+            home_folder = (Path('/') / trains_agent_home).absolute().as_posix()
             rm_tree(home_folder)
             Path(home_folder).mkdir(parents=True, exist_ok=True)
         except:
-            home_folder = '/home/trains_agent_home'
-            rm_tree(home_folder)
-            Path(home_folder).mkdir(parents=True, exist_ok=True)
+            try:
+                home_folder = (Path.home().parent / trains_agent_home).absolute().as_posix()
+                rm_tree(home_folder)
+                Path(home_folder).mkdir(parents=True, exist_ok=True)
+            except:
+                home_folder = (Path(gettempdir()) / trains_agent_home).absolute().as_posix()
+                rm_tree(home_folder)
+                Path(home_folder).mkdir(parents=True, exist_ok=True)
 
         # move our entire venv into the new home
         venv_folder = venv_folder.as_posix()
diff --git a/trains_agent/helper/singleton.py b/trains_agent/helper/singleton.py
index 36a95da..832ad0d 100644
--- a/trains_agent/helper/singleton.py
+++ b/trains_agent/helper/singleton.py
@@ -137,3 +137,7 @@ class Singleton(object):
         if os.environ.get(ENV_K8S_HOST_MOUNT):
             return os.environ.get(ENV_K8S_HOST_MOUNT).split(':')[-1]
         return gettempdir()
+
+    @classmethod
+    def get_slot(cls):
+        return cls.instance_slot or 0