1:12 p.m.
Changes in V4:
* Update log removal interval to 6 hours
Changes in V3:
* Replaced cron by cherrypy's BackgroundTask
* Created RequestLogger class
* Removed --req-log config option
* Small fixes
Changes in V2:
* applied review from gingerbase patch
* added download option
* added crontab for deleting generated downloads
* log login/logout requests
User requests log is saved by default at log/wok-req.log. The maximum file
size is 3 MB and there is rotation with log/wok-req.log.1, which means it will
use at most 6 MB of disk space. Suggestions here are appreciated.
The log format is JSON, since:
* the web user interface will provide a log utility to easily search and filter
log results.
* there is a download function which generates a log-like text file based on
search results.
Request log results can be searched using the following parameters:
* app: filter by application that received the request (wok, kimchi, etc.)
* user: filter by user that performed the request
* req: filter by request type: POST, DELETE, PUT. GET requests are not logged.
* date: filter by request date in format YYYY-MM-DD
* download: generate a log-like text file for download
Sample JSON response:
dev@u1510:~$ curl -u dev -H "Content-Type: application/json" -H "Accept:
application/json" "http://localhost:8010/logs?download=True" -X GET -d
'{}'
Enter host password for user 'dev':
{
"records":[
{
"app":"wok",
"req":"POST",
"user":"dev",
"time":"14:39:59",
"date":"2016-02-25",
"message":"User 'dev' logout"
},
(...truncated...)
{
"app":"gingerbase",
"req":"POST",
"user":"dev",
"time":"14:42:31",
"date":"2016-02-25",
"message":"Host software update"
}
],
"uri":"/data/logs/tmpbnOzP2.txt"
}
"uri" value can then be used to download log file:
dev@u1510:~$ curl -u dev -H "Content-Type: application/json" -H "Accept:
application/json" "http://localhost:8010/data/logs/tmpbnOzP2.txt" -X GET -d
'{}'
Enter host password for user 'dev':
[2016-02-25 14:39:59] POST wok dev: User 'dev' logout
[2016-02-25 14:40:13] POST gingerbase dev: Create host debug report 'test'
[2016-02-25 14:40:58] PUT gingerbase dev: Update host debug report 'test0'
[2016-02-25 14:41:10] DELETE gingerbase dev: Delete host debug report 'test0'
[2016-02-25 14:41:55] POST gingerbase dev: Enable host software repository
'archive.canonical.com-wily-partner'
[2016-02-25 14:42:06] POST gingerbase dev: Disable host software repository
'archive.canonical.com-wily-partner'
[2016-02-25 14:42:31] POST gingerbase dev: Host software update
Lucio Correia (4):
Add User Request Logger
Log user requests
Implement User Request Logger API
Fix tests
docs/API/logs.md | 27 +++++++
src/wok/config.py.in | 10 +++
src/wok/control/base.py | 81 +++++++++++++++++++--
src/wok/control/logs.py | 43 +++++++++++
src/wok/i18n.py | 4 +-
src/wok/model/logs.py | 31 ++++++++
src/wok/reqlogger.py | 184 ++++++++++++++++++++++++++++++++++++++++++++++++
src/wok/root.py | 28 ++++++++
src/wok/server.py | 6 ++
src/wok/utils.py | 32 +++++++++
tests/utils.py | 1 +
11 files changed, 440 insertions(+), 7 deletions(-)
create mode 100644 docs/API/logs.md
create mode 100644 src/wok/control/logs.py
create mode 100644 src/wok/model/logs.py
create mode 100644 src/wok/reqlogger.py
--
1.9.1
1:12 p.m.
New subject: [PATCH] [Wok 1/4] Add User Request Logger
Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com>
---
src/wok/config.py.in | 10 +++
src/wok/i18n.py | 4 +-
src/wok/reqlogger.py | 184 +++++++++++++++++++++++++++++++++++++++++++++++++++
src/wok/utils.py | 20 ++++++
4 files changed, 217 insertions(+), 1 deletion(-)
create mode 100644 src/wok/reqlogger.py
diff --git a/src/wok/config.py.in b/src/wok/config.py.in
index 40fbcda..afe0f08 100644
--- a/src/wok/config.py.in
+++ b/src/wok/config.py.in
@@ -60,6 +60,10 @@ FONTS_PATH = {
SESSIONSTIMEOUT = 10 # session time out is 10 minutes
+def get_log_download_path():
+ return os.path.join(paths.state_dir, 'logs')
+
+
def get_object_store():
return os.path.join(paths.state_dir, 'objectstore')
@@ -188,6 +192,12 @@ class WokConfig(dict):
'tools.sessions.timeout': SESSIONSTIMEOUT,
'tools.wokauth.on': False
},
+ '/data/logs': {
+ 'tools.staticdir.on': True,
+ 'tools.staticdir.dir': '%s/logs' % paths.state_dir,
+ 'tools.nocache.on': False,
+ 'tools.wokauth.on': True,
+ },
'/base64/jquery.base64.js': {
'tools.staticfile.on': True,
'tools.staticfile.filename': '%s/base64/jquery.base64.js' %
diff --git a/src/wok/i18n.py b/src/wok/i18n.py
index 82d28d1..e6087f4 100644
--- a/src/wok/i18n.py
+++ b/src/wok/i18n.py
@@ -37,12 +37,14 @@ messages = {
"WOKASYNC0002E": _("Unable to start task due error: %(err)s"),
"WOKASYNC0003E": _("Timeout of %(seconds)s seconds expired while
running task '%(task)s."),
-
"WOKAUTH0001E": _("Authentication failed for user
'%(username)s'. [Error code: %(code)s]"),
"WOKAUTH0002E": _("You are not authorized to access Kimchi"),
"WOKAUTH0003E": _("Specify %(item)s to login into Kimchi"),
"WOKAUTH0005E": _("Invalid LDAP configuration: %(item)s :
%(value)s"),
+ "WOKLOG0001E": _("Invalid filter parameter. Filter parameters allowed:
%(filters)s"),
+ "WOKLOG0002E": _("Creation of log file failed: %(err)s"),
+
"WOKOBJST0001E": _("Unable to find %(item)s in datastore"),
"WOKUTILS0001E": _("Unable to reach %(url)s. Make sure it is
accessible and try again."),
diff --git a/src/wok/reqlogger.py b/src/wok/reqlogger.py
new file mode 100644
index 0000000..3e79377
--- /dev/null
+++ b/src/wok/reqlogger.py
@@ -0,0 +1,184 @@
+#
+# Project Wok
+#
+# Copyright IBM Corp, 2016
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+
+import json
+import logging
+import logging.handlers
+import os.path
+
+from cherrypy.process.plugins import BackgroundTask
+from datetime import datetime
+from tempfile import NamedTemporaryFile
+
+from wok.config import config, get_log_download_path
+from wok.exception import InvalidParameter, OperationFailed
+from wok.utils import remove_old_files
+
+
+# Log search setup
+FILTER_FIELDS = ['app', 'date', 'download', 'req',
'user']
+LOG_DOWNLOAD_URI = "/data/logs/%s"
+LOG_DOWNLOAD_TIMEOUT = 6
+LOG_FORMAT = "[%(date)s %(time)s] %(req)-6s %(app)-11s %(user)s:
%(message)s\n"
+SECONDS_PER_HOUR = 360
+
+# Log handler setup
+MAX_FILE_SIZE = 3072000
+NUM_BACKUP_FILES = 1
+REQUEST_LOG_FILE = "wok-req.log"
+WOK_REQUEST_LOGGER = "wok_request_logger"
+
+
+class RequestLogger(object):
+ def __init__(self):
+ log = os.path.join(config.get("logging", "log_dir"),
REQUEST_LOG_FILE)
+ h = logging.handlers.RotatingFileHandler(log, 'a',
+ maxBytes=MAX_FILE_SIZE,
+ backupCount=NUM_BACKUP_FILES)
+ h.setFormatter(logging.Formatter('%(message)s'))
+ self.handler = h
+ self.logger = logging.getLogger(WOK_REQUEST_LOGGER)
+ self.logger.setLevel(logging.INFO)
+ self.logger.addHandler(self.handler)
+
+ # start request log's downloadable temporary files removal task
+ interval = LOG_DOWNLOAD_TIMEOUT * SECONDS_PER_HOUR
+ self.clean_task = BackgroundTask(interval, self.cleanLogFiles)
+ self.clean_task.start()
+
+ def cleanLogFiles(self):
+ globexpr = "%s/*.txt" % get_log_download_path()
+ remove_old_files(globexpr, LOG_DOWNLOAD_TIMEOUT)
+
+
+class RequestParser(object):
+ def __init__(self):
+ logger = logging.getLogger(WOK_REQUEST_LOGGER)
+ self.baseFile = logger.handlers[0].baseFilename
+ self.downloadDir = get_log_download_path()
+
+ def generateLogFile(self, records):
+ """
+ Generates a log-format text file with lines for each record specified.
+ Returns a download URI for the generated file.
+ """
+ try:
+ # sort records chronologically
+ sortedList = sorted(records, key=lambda k: k['date'] +
k['time'])
+
+ # generate log file
+ fd = NamedTemporaryFile(mode='w', dir=self.downloadDir,
+ suffix='.txt', delete=False)
+
+ with fd:
+ for record in sortedList:
+ fd.write(LOG_FORMAT % record)
+
+ fd.close()
+ except IOError as e:
+ raise OperationFailed("WOKLOG0002E", {'err': str(e)})
+
+ return LOG_DOWNLOAD_URI % os.path.basename(fd.name)
+
+ def getRecords(self):
+ records = self.getRecordsFromFile(self.baseFile)
+
+ for count in range(NUM_BACKUP_FILES):
+ filename = ".".join([self.baseFile, str(count + 1)])
+ records.extend(self.getRecordsFromFile(filename))
+
+ return records
+
+ def getRecordsFromFile(self, filename):
+ """
+ Returns a list of dict, where each dict corresponds to a request
+ record.
+ """
+ records = []
+
+ if not os.path.exists(filename):
+ return []
+
+ # read records from file
+ try:
+ with open(filename) as f:
+ line = f.readline()
+ while line != "":
+ data = line.split(">>>")
+ if len(data) > 1:
+ record = json.JSONDecoder().decode(data[0])
+ record['message'] = data[1].strip()
+ records.append(record)
+
+ line = f.readline()
+
+ f. close()
+ except IOError as e:
+ raise OperationFailed("WOKLOG0002E", {'err': str(e)})
+
+ return records
+
+ def getFilteredRecords(self, filter_params):
+ """
+ Returns a dict containing the filtered list of request log entries
+ (dicts), and an optional uri for downloading results in a text file.
+ """
+ uri = None
+ results = []
+ records = self.getRecords()
+
+ # fail for unrecognized filter options
+ for key in filter_params.keys():
+ if key not in FILTER_FIELDS:
+ filters = ", ".join(FILTER_FIELDS)
+ raise InvalidParameter("WOKLOG0001E", {"filters":
filters})
+
+ download = filter_params.pop('download', False)
+
+ # filter records according to parameters
+ for record in records:
+ if all(key in record and record[key] == val
+ for key, val in filter_params.iteritems()):
+ results.append(record)
+
+ # download option active: generate text file and provide donwload uri
+ if download and len(results) > 0:
+ uri = self.generateLogFile(results)
+
+ return {'uri': uri, 'records': results}
+
+
+class RequestRecord(object):
+ def __init__(self, message, **kwargs):
+ self.message = message
+ self.kwargs = kwargs
+
+ # register timestamp
+ timestamp = datetime.today()
+ self.kwargs['date'] = timestamp.strftime('%Y-%m-%d')
+ self.kwargs['time'] = timestamp.strftime('%H:%M:%S')
+
+ def __str__(self):
+ info = json.JSONEncoder().encode(self.kwargs)
+ return '%s >>> %s' % (info, self.message)
+
+ def log(self):
+ reqLogger = logging.getLogger(WOK_REQUEST_LOGGER)
+ reqLogger.info(self)
diff --git a/src/wok/utils.py b/src/wok/utils.py
index e2f1d8e..48fe414 100644
--- a/src/wok/utils.py
+++ b/src/wok/utils.py
@@ -21,6 +21,7 @@
#
import cherrypy
+import glob
import grp
import os
import psutil
@@ -31,7 +32,9 @@ import subprocess
import sys
import traceback
import xml.etree.ElementTree as ET
+
from cherrypy.lib.reprconf import Parser
+from datetime import datetime, timedelta
from multiprocessing import Process, Queue
from threading import Timer
@@ -336,6 +339,23 @@ def probe_file_permission_as_user(file, user):
return queue.get()
+def remove_old_files(globexpr, hours):
+ """
+ Delete files matching globexpr that are older than specified hours.
+ """
+ minTime = datetime.now() - timedelta(hours=hours)
+
+ try:
+ for f in glob.glob(globexpr):
+ timestamp = os.path.getmtime(f)
+ fileTime = datetime.fromtimestamp(timestamp)
+
+ if fileTime < minTime:
+ os.remove(f)
+ except (IOError, OSError) as e:
+ wok_log.error(str(e))
+
+
def get_next_clone_name(all_names, basename, name_suffix=''):
"""Find the next available name for a cloned resource.
--
1.9.1
1:12 p.m.
New subject: [PATCH] [Wok 2/4] Log user requests
Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com>
---
src/wok/control/base.py | 81 +++++++++++++++++++++++++++++++++++++++++++++----
src/wok/root.py | 28 +++++++++++++++++
src/wok/server.py | 6 ++++
src/wok/utils.py | 12 ++++++++
4 files changed, 121 insertions(+), 6 deletions(-)
diff --git a/src/wok/control/base.py b/src/wok/control/base.py
index 363fd60..f44771e 100644
--- a/src/wok/control/base.py
+++ b/src/wok/control/base.py
@@ -32,6 +32,15 @@ from wok.control.utils import validate_params
from wok.exception import InvalidOperation, InvalidParameter
from wok.exception import MissingParameter, NotFoundError
from wok.exception import OperationFailed, UnauthorizedError, WokException
+from wok.reqlogger import RequestRecord
+from wok.utils import get_plugin_from_request
+
+
+LOG_DISABLED_METHODS = ['GET']
+
+# Default request log messages
+COLLECTION_DEFAULT_LOG = "request on collection"
+RESOURCE_DEFAULT_LOG = "request on resource"
class Resource(object):
@@ -58,6 +67,7 @@ class Resource(object):
self.model_args = (ident,)
self.role_key = None
self.admin_methods = []
+ self.log_map = {}
def _redirect(self, action_result, code=303):
uri_params = []
@@ -102,7 +112,8 @@ class Resource(object):
def _generate_action_handler_base(self, action_name, render_fn,
destructive=False, action_args=None):
def wrapper(*args, **kwargs):
- validate_method(('POST'), self.role_key, self.admin_methods)
+ method = 'POST'
+ validate_method((method), self.role_key, self.admin_methods)
try:
self.lookup()
if not self.is_authorized():
@@ -137,6 +148,17 @@ class Resource(object):
raise cherrypy.HTTPError(500, e.message)
except WokException, e:
raise cherrypy.HTTPError(500, e.message)
+ finally:
+ params = {}
+ if model_args:
+ params = {'ident': str(model_args[0])}
+
+ RequestRecord(
+ self.getRequestMessage(method, action_name) % params,
+ app=get_plugin_from_request(),
+ req=method,
+ user=cherrypy.session.get(USER_NAME, 'N/A')
+ ).log()
wrapper.__name__ = action_name
wrapper.exposed = True
@@ -162,6 +184,18 @@ class Resource(object):
raise cherrypy.HTTPError(500, e.message)
except InvalidOperation, e:
raise cherrypy.HTTPError(400, e.message)
+ finally:
+ method = 'DELETE'
+ params = {}
+ if self.model_args:
+ params = {'ident': str(self.model_args[0])}
+
+ RequestRecord(
+ self.getRequestMessage(method, 'default') % params,
+ app=get_plugin_from_request(),
+ req=method,
+ user=cherrypy.session.get(USER_NAME, 'N/A')
+ ).log()
@cherrypy.expose
def index(self, *args, **kargs):
@@ -203,14 +237,23 @@ class Resource(object):
return user_name in users or len(set(user_groups) & set(groups)) > 0
def update(self, *args, **kargs):
+ params = parse_request()
+
try:
update = getattr(self.model, model_fn(self, 'update'))
except AttributeError:
e = InvalidOperation('WOKAPI0003E', {'resource':
get_class_name(self)})
raise cherrypy.HTTPError(405, e.message)
+ finally:
+ method = 'PUT'
+ RequestRecord(
+ self.getRequestMessage(method) % params,
+ app=get_plugin_from_request(),
+ req=method,
+ user=cherrypy.session.get(USER_NAME, 'N/A')
+ ).log()
- params = parse_request()
validate_params(params, self, 'update')
args = list(self.model_args) + [params]
@@ -222,6 +265,13 @@ class Resource(object):
def get(self):
return wok.template.render(get_class_name(self), self.data)
+ def getRequestMessage(self, method, action='default'):
+ """
+ Provide customized user activity log message in inherited classes
+ through log_map attribute.
+ """
+ return self.log_map.get(method, {}).get(action, RESOURCE_DEFAULT_LOG)
+
@property
def data(self):
"""
@@ -273,6 +323,7 @@ class Collection(object):
self.model_args = []
self.role_key = None
self.admin_methods = []
+ self.log_map = {}
def create(self, params, *args):
try:
@@ -341,18 +392,28 @@ class Collection(object):
data = self.filter_data(resources, fields_filter)
return wok.template.render(get_class_name(self), data)
+ def getRequestMessage(self, method):
+ """
+ Provide customized user activity log message in inherited classes
+ through log_map attribute.
+ """
+ return self.log_map.get(method, {}).get('default',
+ COLLECTION_DEFAULT_LOG)
+
@cherrypy.expose
def index(self, *args, **kwargs):
+ params = {}
method = validate_method(('GET', 'POST'),
self.role_key, self.admin_methods)
try:
if method == 'GET':
- filter_params = cherrypy.request.params
- validate_params(filter_params, self, 'get_list')
- return self.get(filter_params)
+ params = cherrypy.request.params
+ validate_params(params, self, 'get_list')
+ return self.get(params)
elif method == 'POST':
- return self.create(parse_request(), *args)
+ params = parse_request()
+ return self.create(params, *args)
except InvalidOperation, e:
raise cherrypy.HTTPError(400, e.message)
except InvalidParameter, e:
@@ -365,6 +426,14 @@ class Collection(object):
raise cherrypy.HTTPError(500, e.message)
except WokException, e:
raise cherrypy.HTTPError(500, e.message)
+ finally:
+ if method not in LOG_DISABLED_METHODS:
+ RequestRecord(
+ self.getRequestMessage(method) % params,
+ app=get_plugin_from_request(),
+ req=method,
+ user=cherrypy.session.get(USER_NAME, 'N/A')
+ ).log()
class AsyncCollection(Collection):
diff --git a/src/wok/root.py b/src/wok/root.py
index 174a9b9..7a5fe9c 100644
--- a/src/wok/root.py
+++ b/src/wok/root.py
@@ -32,6 +32,16 @@ from wok.control import sub_nodes
from wok.control.base import Resource
from wok.control.utils import parse_request
from wok.exception import MissingParameter, OperationFailed
+from wok.reqlogger import RequestRecord
+from wok.utils import get_plugin_from_request
+
+
+ROOT_REQUESTS = {
+ 'POST': {
+ 'login': "User '%(username)s' login",
+ 'logout': "User '%(username)s' logout",
+ },
+}
class Root(Resource):
@@ -129,6 +139,7 @@ class WokRoot(Root):
self.paths = wok_paths
self.domain = 'wok'
self.messages = messages
+ self.log_map = ROOT_REQUESTS
@cherrypy.expose
def login(self, *args):
@@ -144,10 +155,27 @@ class WokRoot(Root):
user_info = auth.login(username, password)
except OperationFailed:
raise cherrypy.HTTPError(401)
+ finally:
+ method = 'POST'
+ RequestRecord(
+ self.getRequestMessage(method, 'login') % params,
+ app=get_plugin_from_request(),
+ req=method,
+ user=cherrypy.session.get(auth.USER_NAME, 'N/A')
+ ).log()
return json.dumps(user_info)
@cherrypy.expose
def logout(self):
+ method = 'POST'
+ params = {'username': cherrypy.session.get(auth.USER_NAME,
'N/A')}
+ RequestRecord(
+ self.getRequestMessage(method, 'logout') % params,
+ app=get_plugin_from_request(),
+ req=method,
+ user=params['username']
+ ).log()
+
auth.logout()
return '{}'
diff --git a/src/wok/server.py b/src/wok/server.py
index 75b41d5..122efff 100644
--- a/src/wok/server.py
+++ b/src/wok/server.py
@@ -34,10 +34,12 @@ from wok.config import paths, PluginConfig, WokConfig
from wok.control import sub_nodes
from wok.model import model
from wok.proxy import start_proxy, terminate_proxy
+from wok.reqlogger import RequestLogger
from wok.root import WokRoot
from wok.safewatchedfilehandler import SafeWatchedFileHandler
from wok.utils import get_enabled_plugins, import_class
+
LOGGING_LEVEL = {"debug": logging.DEBUG,
"info": logging.INFO,
"warning": logging.WARNING,
@@ -65,6 +67,7 @@ class Server(object):
start_proxy(options)
make_dirs = [
+ os.path.abspath(config.get_log_download_path()),
os.path.dirname(os.path.abspath(options.access_log)),
os.path.dirname(os.path.abspath(options.error_log)),
os.path.dirname(os.path.abspath(config.get_object_store()))
@@ -130,6 +133,9 @@ class Server(object):
# Add error log file to cherrypy configuration
cherrypy.log.error_log.addHandler(h)
+ # start request logger
+ self.reqLogger = RequestLogger()
+
# only add logrotate if wok is installed
if paths.installed:
diff --git a/src/wok/utils.py b/src/wok/utils.py
index 48fe414..e3a4124 100644
--- a/src/wok/utils.py
+++ b/src/wok/utils.py
@@ -123,6 +123,18 @@ def get_all_tabs():
return tabs
+def get_plugin_from_request():
+ """
+ Returns name of plugin being requested. If no plugin, returns 'wok'.
+ """
+ script_name = cherrypy.request.script_name
+ split = script_name.split('/')
+ if len(split) > 2 and split[1] == 'plugins':
+ return split[2]
+
+ return 'wok'
+
+
def import_class(class_path):
module_name, class_name = class_path.rsplit('.', 1)
try:
--
1.9.1
1:12 p.m.
New subject: [PATCH] [Wok 3/4] Implement User Request Logger API
Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com>
---
docs/API/logs.md | 27 +++++++++++++++++++++++++++
src/wok/control/logs.py | 43 +++++++++++++++++++++++++++++++++++++++++++
src/wok/model/logs.py | 31 +++++++++++++++++++++++++++++++
3 files changed, 101 insertions(+)
create mode 100644 docs/API/logs.md
create mode 100644 src/wok/control/logs.py
create mode 100644 src/wok/model/logs.py
diff --git a/docs/API/logs.md b/docs/API/logs.md
new file mode 100644
index 0000000..f808e1a
--- /dev/null
+++ b/docs/API/logs.md
@@ -0,0 +1,27 @@
+## REST API Specification for Logs
+
+### Collection: Logs
+
+**URI:** /logs
+
+**Methods:**
+
+* **GET**: Retrieve a list of entries from User Request Log
+ * Parameters:
+ * app: Filter entries by application that received the request.
+ Use "wok" or any plugin installed, like "kimchi".
+ * req: Filter entries by type of request: "DELETE", "POST",
"PUT".
+ "GET" requests are not logged.
+ * user: Filter entries by user that performed the request.
+ * date: Filter entries by date of record in the format "YYYY-MM-DD"
+ * download: Generate text file for download of search results.
+
+#### Examples
+GET /logs?download=True
+{'records': [{entry-record1}, {entry-record2}, {entry-record3}, ...],
+'uri': "/data/logs/tmpbnOzP2.txt"}
+
+GET /logs?user=dev&app=ginger
+{'records': [{entry-record1}, {entry-record2}, {entry-record3}, ...],
+'uri': None}
+
diff --git a/src/wok/control/logs.py b/src/wok/control/logs.py
new file mode 100644
index 0000000..0eb04d7
--- /dev/null
+++ b/src/wok/control/logs.py
@@ -0,0 +1,43 @@
+#
+# Project Wok
+#
+# Copyright IBM Corp, 2016
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import wok.template
+
+from wok.control.base import SimpleCollection
+from wok.control.utils import get_class_name, model_fn
+from wok.control.utils import UrlSubNode
+
+
+@UrlSubNode("logs")
+class Logs(SimpleCollection):
+ def __init__(self, model):
+ super(Logs, self).__init__(model)
+ self.role_key = 'logs'
+ self.admin_methods = ['GET']
+
+ def get(self, filter_params):
+ res_list = []
+
+ try:
+ get_list = getattr(self.model, model_fn(self, 'get_list'))
+ res_list = get_list(filter_params)
+ except AttributeError:
+ pass
+
+ return wok.template.render(get_class_name(self), res_list)
diff --git a/src/wok/model/logs.py b/src/wok/model/logs.py
new file mode 100644
index 0000000..89a79ab
--- /dev/null
+++ b/src/wok/model/logs.py
@@ -0,0 +1,31 @@
+#
+# Project Wok
+#
+# Copyright IBM Corp, 2016
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+from wok.reqlogger import RequestParser
+
+
+class LogsModel(object):
+ def __init__(self, **kargs):
+ pass
+
+ def get_list(self, filter_params):
+ if filter_params:
+ return RequestParser().getFilteredRecords(filter_params)
+
+ return RequestParser().getRecords()
--
1.9.1
1:12 p.m.
New subject: [PATCH] [Wok 4/4] Fix tests
Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com>
---
tests/utils.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/utils.py b/tests/utils.py
index d158ba1..249205d 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -119,6 +119,7 @@ def run_server(host, port, ssl_port, test_mode, cherrypy_port=None,
'websockets_port': 64667, 'ssl_cert': '',
'ssl_key': '',
'max_body_size': '4*1024', 'test': test_mode,
'access_log': '/dev/null', 'error_log':
'/dev/null',
+ 'req_log': '/dev/null',
'environment': environment, 'log_level':
'debug'})()
if model is not None:
setattr(args, 'model', model)
--
1.9.1
2975
days inactive
2975
days old
5 comments
2 participants
participants (2)
-
Aline Manera -
Lucio Correia