Author: chrisz
Date: Wed Sep 28 04:08:16 2005
New Revision: 3338
Modified:
Webware/trunk/bin/MakeAppWorkDir.py
Log:
Some more improvements in MakeAppWorkDir.py
Modified: Webware/trunk/bin/MakeAppWorkDir.py
==============================================================================
--- Webware/trunk/bin/MakeAppWorkDir.py (original)
+++ Webware/trunk/bin/MakeAppWorkDir.py Wed Sep 28 04:08:16 2005
@@ -162,8 +162,19 @@
self.msg("Creating the launcher scripts...")
workDir = self._workDir
webwareDir = self._webwareDir
- libraryDirs = self._libraryDirs
webKitDir = self._webKitDir
+ libraryDirs = self._libraryDirs
+ uid, gid = self._uid, self._gid
+ if uid is None:
+ user = None
+ else:
+ import pwd
+ user = pwd.getpwuid(uid)[0]
+ if gid is None:
+ group = None
+ else:
+ import grp
+ group = grp.getgrgid(gid)[0]
executable = sys.executable
for name in launcherScripts:
if name.endswith('Service.py') and self._osType != 'nt':
@@ -316,8 +327,13 @@
'Launch.py': """#!%(executable)s
# Adjust Launcher default parameters:
-webwareDir = '%(webwareDir)s'
-libraryDirs = %(libraryDirs)s
+webwareDir = %(webwareDir)r
+libraryDirs = %(libraryDirs)r
+runProfile = 0
+logFile = None
+pidFile = None
+user = %(user)r
+group = %(group)r
import sys
sys.path.insert(0, webwareDir)
@@ -326,6 +342,11 @@
Launch.webwareDir = webwareDir
Launch.libraryDirs = libraryDirs
+Launch.runProfile = runProfile
+Launch.logFile = logFile
+Launch.pidFile = pidFile
+Launch.user = user
+Launch.group = group
if __name__ == '__main__':
Launch.main()
@@ -334,8 +355,10 @@
'AppServerService.py': """#!%(executable)s
# Adjust AppServerService default parameters:
-webwareDir = '%(webwareDir)s'
-libraryDirs = %(libraryDirs)s
+webwareDir = %(webwareDir)r
+libraryDirs = %(libraryDirs)r
+runProfile = 0
+logFile = None
import sys
sys.path.insert(0, webwareDir)
@@ -348,6 +371,8 @@
appServerService.AppServerService = AppServerService
appServerService.webwareDir = webwareDir
appServerService.libraryDirs = libraryDirs
+appServerService.runProfile = runProfile
+appServerService.logFile = logFile
if __name__ == '__main__':
appServerService.main()
|