Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit 32cabe274b058c8ec8eeea3dd9dba4143cb15294
Author: Valentin Gologuzov <vgologuz(a)redhat.com>
Date: Wed Oct 1 17:26:26 2014 +0200
[keygen] added script to run dev instance
---------------------------------------------------------------
keygen/run/dev_run.conf | 13 +++++++++++++
keygen/run/dev_run.py | 15 ++++++++++++++-
keygen/src/copr_keygen/__init__.py | 4 +++-
3 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/keygen/run/dev_run.conf b/keygen/run/dev_run.conf
new file mode 100644
index 0000000..81750f4
--- /dev/null
+++ b/keygen/run/dev_run.conf
@@ -0,0 +1,13 @@
+DEBUG = True
+
+PHRASES_DIR = "/tmp/copr-keygen/var/lib/copr-keygen/phrases/"
+GPG_BINARY = "/bin/gpg2"
+GNUPG_HOMEDIR = "/tmp/copr-keygen/var/lib/copr-keygen/gnupg"
+
+GPG_KEY_LENGTH = 2048
+GPG_EXPIRE = "5y"
+
+LOG_DIR = "/tmp/copr-keygen/var/log/copr-keygen"
+import logging
+LOG_LEVEL = logging.DEBUG
+DEBUG_WITH_LOG = True
diff --git a/keygen/run/dev_run.py b/keygen/run/dev_run.py
index 3511bc5..3f75e4e 100755
--- a/keygen/run/dev_run.py
+++ b/keygen/run/dev_run.py
@@ -2,12 +2,25 @@
import sys
sys.path.append("../src/")
+
+import os
+import glob
+os.environ["COPR_KEYGEN_CONFIG"] = glob.glob("./run/dev_run.conf")
+
+for d in [
+ "/tmp/copr-keygen/var/lib/copr-keygen/phrases/",
+ "/tmp/copr-keygen/var/lib/copr-keygen/gnupg",
+ "/tmp/copr-keygen/var/log/copr-keygen"
+]:
+ if not os.path.exists(d):
+ os.makedirs(d)
+
from copr_keygen import app
import logging
logging.basicConfig(
- level=logging.INFO,
+ level=logging.DEBUG,
format= '[%(asctime)s] {%(pathname)s:%(lineno)d} %(levelname)s -
%(message)s',
datefmt='%H:%M:%S'
)
diff --git a/keygen/run_tests.sh b/keygen/run_tests.sh
old mode 100644
new mode 100755
diff --git a/keygen/src/copr_keygen/__init__.py b/keygen/src/copr_keygen/__init__.py
index 41f19b3..0388d18 100644
--- a/keygen/src/copr_keygen/__init__.py
+++ b/keygen/src/copr_keygen/__init__.py
@@ -20,7 +20,7 @@ app.config.from_envvar("COPR_KEYGEN_CONFIG", silent=True)
# setup logger
-if not app.config["DEBUG"]:
+if not app.config["DEBUG"] or app.config["DEBUG_WITH_LOG"]:
filename = os.path.join(app.config["LOG_DIR"], "main.log")
if os.path.exists(app.config["LOG_DIR"]):
handler = RotatingFileHandler(filename,
@@ -51,6 +51,7 @@ def ping():
:status 200: server alive
"""
+ log.debug("got ping")
return Response("pong\n",
content_type="text/plain;charset=UTF-8")
@@ -91,6 +92,7 @@ def gen_key():
except Exception as e:
raise BadRequestException("Failed to parse request body:
{}".format(e))
+ log.info("received gen_key query: {}".format(query))
if "name_real" not in query:
raise BadRequestException("Request query missing required "
"parameter `name_real`".format(query))