summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Crute <mcrute@gmail.com>2011-02-25 13:40:50 -0600
committerMike Crute <mcrute@gmail.com>2011-02-25 13:40:50 -0600
commitbda12b68a0dc2b96eabfd90ee1756ef56f50191d (patch)
treee1a047f22e58c89c9a62543f313cc457cfa2bb6e
parentc8d7c1951cf2268b7d8a33c1b8a573694015d812 (diff)
downloadhg_hosting-bda12b68a0dc2b96eabfd90ee1756ef56f50191d.tar.bz2
hg_hosting-bda12b68a0dc2b96eabfd90ee1756ef56f50191d.tar.xz
hg_hosting-bda12b68a0dc2b96eabfd90ee1756ef56f50191d.zip
Fixing log path issue
-rwxr-xr-xlock-repo.py4
-rw-r--r--repolib.py2
-rwxr-xr-xvalidate-login.py4
3 files changed, 5 insertions, 5 deletions
diff --git a/lock-repo.py b/lock-repo.py
index ef2a5f0..9bc1ec1 100755
--- a/lock-repo.py
+++ b/lock-repo.py
@@ -14,7 +14,7 @@ import repolib
14 14
15def check_repo(env, log): 15def check_repo(env, log):
16 user, repo = env['SSH_HG_USER'], env['SSH_HG_REPO'] 16 user, repo = env['SSH_HG_USER'], env['SSH_HG_REPO']
17 log.debug("Lockcheck perms for %s on %s", user, repo) 17 log.info("Lockcheck perms for %s on %s", user, repo)
18 18
19 repo = repolib.Repository(repo) 19 repo = repolib.Repository(repo)
20 repo.load_from_hgrc() 20 repo.load_from_hgrc()
@@ -27,7 +27,7 @@ def check_repo(env, log):
27 27
28 28
29def main(argv): 29def main(argv):
30 log = repolib.get_logger('validate-login') 30 log = repolib.get_logger('lock-repo')
31 31
32 try: 32 try:
33 return check_repo(os.environ, log) 33 return check_repo(os.environ, log)
diff --git a/repolib.py b/repolib.py
index 4ab2ca9..1b2d136 100644
--- a/repolib.py
+++ b/repolib.py
@@ -279,7 +279,7 @@ class ConfigLoader(object):
279def get_logger(name): 279def get_logger(name):
280 format = "%(levelname)s: %(message)s" 280 format = "%(levelname)s: %(message)s"
281 logging.basicConfig(level=logging.DEBUG, format=format, 281 logging.basicConfig(level=logging.DEBUG, format=format,
282 filename="scripts.log") 282 filename="/srv/hg/scripts.log")
283 283
284 stream = logging.StreamHandler() 284 stream = logging.StreamHandler()
285 stream.setLevel(logging.WARNING) 285 stream.setLevel(logging.WARNING)
diff --git a/validate-login.py b/validate-login.py
index 770b76d..c10d9d1 100755
--- a/validate-login.py
+++ b/validate-login.py
@@ -31,7 +31,7 @@ def main(argv):
31 user = argv[-1] 31 user = argv[-1]
32 path = parse_path() 32 path = parse_path()
33 33
34 log.debug("Validating login for %r on %r", user, path) 34 log.info("Validating login for %r on %r", user, path)
35 35
36 if path: 36 if path:
37 repo = repolib.Repository(path) 37 repo = repolib.Repository(path)
@@ -57,7 +57,7 @@ def main(argv):
57 os.environ['SSH_HG_USER'] = user 57 os.environ['SSH_HG_USER'] = user
58 os.environ['SSH_HG_REPO'] = repo.full_path 58 os.environ['SSH_HG_REPO'] = repo.full_path
59 59
60 log.debug("All checks passed, serving.") 60 log.info("All checks passed, serving.")
61 dispatch.dispatch(['-R', path, 'serve', '--stdio']) 61 dispatch.dispatch(['-R', path, 'serve', '--stdio'])
62 62
63 63