summaryrefslogtreecommitdiff
path: root/bin/swift-proxy-server
diff options
context:
space:
mode:
authorClay Gerrard <clay.gerrard@rackspace.com>2010-11-11 16:41:07 -0600
committerClay Gerrard <clay.gerrard@rackspace.com>2010-11-11 16:41:07 -0600
commit57a35f0d7c85bae8bf78fbc915e5cf73bdc8e4ff (patch)
treefe890f23866c4aabb31265f0d9575e6b6340a625 /bin/swift-proxy-server
parentce0a0be6643f3e21bb200ebc06d9db7d03ff2b8e (diff)
downloadswift-57a35f0d7c85bae8bf78fbc915e5cf73bdc8e4ff.tar.gz
added helper/util to parse command line args; removed some duplicated code in
server/daemon bin scripts; more standized python/linux daemonization procedures; fixed lp:666957 "devauth server creates auth.db with the wrong privileges"; new run_daemon helper based on run_wsgi simplifies daemon launching/testing; new - all servers/daemons support verbose option when started interactivlty which will log to the console; fixed lp:667839 "can't start servers with relative paths to configs"; added tests
Diffstat (limited to 'bin/swift-proxy-server')
-rwxr-xr-xbin/swift-proxy-server8
1 files changed, 3 insertions, 5 deletions
diff --git a/bin/swift-proxy-server b/bin/swift-proxy-server
index 7599f8728..baccf568e 100755
--- a/bin/swift-proxy-server
+++ b/bin/swift-proxy-server
@@ -14,11 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import sys
-
+from swift.common.utils import parse_options
from swift.common.wsgi import run_wsgi
if __name__ == '__main__':
- if len(sys.argv) != 2:
- sys.exit("Usage: %s CONFIG_FILE" % sys.argv[0])
- run_wsgi(sys.argv[1], 'proxy-server', default_port=8080)
+ conf_file, options = parse_options()
+ run_wsgi(conf_file, 'proxy-server', default_port=8080, **options)