[Webware-checkins] r6674 - in Webware/trunk/WebKit: . Docs

Author: chrisz
Date: Thu Jun 28 13:12:07 2007
New Revision: 6674
Modified:
Webware/trunk/WebKit/Docs/Configuration.txt
Webware/trunk/WebKit/ThreadedAppServer.py
Log:
Made the address file name configurable via the AddressFile setting, similar to PidFile (RFE 1718736 by Andrew Butash).
Modified: Webware/trunk/WebKit/Docs/Configuration.txt
==============================================================================
--- Webware/trunk/WebKit/Docs/Configuration.txt (original)
+++ Webware/trunk/WebKit/Docs/Configuration.txt Thu Jun 28 13:12:07 2007
@@ -430,9 +430,16 @@
to this port. Default: ``8080``.
``PidFile``:
When the AppServer starts up, the process ID will be written into this file.
- The path will be relative to the working directory (or WebKit path, if
- you're not using a working directory), or you can specify an absolute path.
- Default: ``WORKDIR/appserver.pid``.
+ The location is relative to the working directory (or WebKit path, if you're
+ not using a working directory), or you can specify an absolute path.
+ Default: ``appserver.pid``.
+``AddressFile``:
+ When the AppServer starts up, the server address (IP address and port)
+ of the adapter handler and other handlers will be written into a file with
+ this file name, where ``%s`` will be replaced by the name of the handler.
+ The location is relative to the working directory (or WebKit path, if you're
+ not using a working directory), or you can specify an absolute path.
+ Default: ``%s.address``.
``PluginDirs``:
When the application server starts up, it looks in these locations for
plugins. Each plugin is a subdirectory of its own. By default WebKit looks
Modified: Webware/trunk/WebKit/ThreadedAppServer.py
==============================================================================
--- Webware/trunk/WebKit/ThreadedAppServer.py (original)
+++ Webware/trunk/WebKit/ThreadedAppServer.py Thu Jun 28 13:12:07 2007
@@ -49,6 +49,7 @@
'RequestQueueSize': 0, # means twice the maximum number of threads
'RequestBufferSize': 8*1024, # 8 kBytes
'ResponseBufferSize': 8*1024, # 8 kBytes
+ 'AddressFile': '%s.address', # %s stands for the protocol name
# @@ the following setting is not yet implemented
# 'SocketType': 'inet', # inet, inet6, unix
}
@@ -569,7 +570,8 @@
def addressFileName(self, handlerClass):
"""Get the name of the text file with the server address."""
- return '%s.address' % handlerClass.protocolName
+ return self.serverSidePath(
+ self.setting('AddressFile') % handlerClass.protocolName)
class Handler:

Thread view

Author: chrisz
Date: Thu Jun 28 13:12:07 2007
New Revision: 6674
Modified:
Webware/trunk/WebKit/Docs/Configuration.txt
Webware/trunk/WebKit/ThreadedAppServer.py
Log:
Made the address file name configurable via the AddressFile setting, similar to PidFile (RFE 1718736 by Andrew Butash).
Modified: Webware/trunk/WebKit/Docs/Configuration.txt
==============================================================================
--- Webware/trunk/WebKit/Docs/Configuration.txt (original)
+++ Webware/trunk/WebKit/Docs/Configuration.txt Thu Jun 28 13:12:07 2007
@@ -430,9 +430,16 @@
to this port. Default: ``8080``.
``PidFile``:
When the AppServer starts up, the process ID will be written into this file.
- The path will be relative to the working directory (or WebKit path, if
- you're not using a working directory), or you can specify an absolute path.
- Default: ``WORKDIR/appserver.pid``.
+ The location is relative to the working directory (or WebKit path, if you're
+ not using a working directory), or you can specify an absolute path.
+ Default: ``appserver.pid``.
+``AddressFile``:
+ When the AppServer starts up, the server address (IP address and port)
+ of the adapter handler and other handlers will be written into a file with
+ this file name, where ``%s`` will be replaced by the name of the handler.
+ The location is relative to the working directory (or WebKit path, if you're
+ not using a working directory), or you can specify an absolute path.
+ Default: ``%s.address``.
``PluginDirs``:
When the application server starts up, it looks in these locations for
plugins. Each plugin is a subdirectory of its own. By default WebKit looks
Modified: Webware/trunk/WebKit/ThreadedAppServer.py
==============================================================================
--- Webware/trunk/WebKit/ThreadedAppServer.py (original)
+++ Webware/trunk/WebKit/ThreadedAppServer.py Thu Jun 28 13:12:07 2007
@@ -49,6 +49,7 @@
'RequestQueueSize': 0, # means twice the maximum number of threads
'RequestBufferSize': 8*1024, # 8 kBytes
'ResponseBufferSize': 8*1024, # 8 kBytes
+ 'AddressFile': '%s.address', # %s stands for the protocol name
# @@ the following setting is not yet implemented
# 'SocketType': 'inet', # inet, inet6, unix
}
@@ -569,7 +570,8 @@
def addressFileName(self, handlerClass):
"""Get the name of the text file with the server address."""
- return '%s.address' % handlerClass.protocolName
+ return self.serverSidePath(
+ self.setting('AddressFile') % handlerClass.protocolName)
class Handler: