- Kimchi-devel - oVirt List Archives

[PATCH V2] Create new storage volume when attaching disk to a guest.
by pvital＠linux.vnet.ibm.com 29 Jan '16

29 Jan '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> Changes in V2: * Updated test cases * Modified dictionary return of parameters V1: Add back-end support to create new storage volume (new virtual disk) when attaching disk to a guest created before. There are three essential parameters to create the new volume: * vol: Storage volume name of disk image, that should be 'new_vol'. * capacity: The total space which can be used to store new volumes. The unit is bytes. * format: The format of the defined Storage Volume. Only used when creating a storage volume with 'capacity'. To test this patch: $ curl -k -u test -H "Content-Type: application/json" -H "Accept: application/json" 'https://localhost:8001/plugins/kimchi/vms/kimchi-vm-new/storages' -X POST -d '{ "vol": "new_vol", "type": "disk", "pool": "default", "format": "qcow2", "capacity": 1024 }' Enter host password for user 'test': { "bus":"virtio", "path":"/var/lib/libvirt/images/2477bfd8-a9e2-4887-a683-e89015b3ba11 -1.img", "type":"disk", "dev":"vdb", "format":"qcow2" } $ curl -k -u test -H "Content-Type: application/json" -H "Accept: application/json" 'https://localhost:8001/plugins/kimchi/vms/kimchi-vm-new/storages' -X GET Enter host password for user 'test': [ { "bus":"virtio", "path":"/var/lib/libvirt/images/2477bfd8-a9e2-4887-a683 -e89015b3ba11-0.img", "type":"disk", "dev":"vda", "format":"qcow2" }, { "bus":"virtio", "path":"/var/lib/libvirt/images/2477bfd8-a9e2-4887-a683 -e89015b3ba11-1.img", "type":"disk", "dev":"vdb", "format":"qcow2" }, { "bus":"ide", "path":"/var/lib/kimchi/tests/ubuntu14.04.iso", "type":"cdrom", "dev":"hdc", "format":"raw" } ] Paulo Vital (1): Create new storage volume when attaching disk to a guest. src/wok/plugins/kimchi/API.json | 12 ++++++++++++ src/wok/plugins/kimchi/docs/API.md | 6 +++++- src/wok/plugins/kimchi/i18n.py | 1 + src/wok/plugins/kimchi/model/vmstorages.py | 28 +++++++++++++++++++++++++++- src/wok/plugins/kimchi/tests/test_model.py | 25 +++++++++++++++++++++++++ 5 files changed, 70 insertions(+), 2 deletions(-) -- 2.4.3

5 7

[PATCH] [Wok] Raise 401 HTTP Error when login fails
by Aline Manera 29 Jan '16

29 Jan '16

When using the REST API to login into Wok, on any error the return code was wrongly set to 500, due the OperationFailed exception. Fix it. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/wok/auth.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wok/auth.py b/src/wok/auth.py index afd4cf4..3f1c8d5 100644 --- a/src/wok/auth.py +++ b/src/wok/auth.py @@ -70,8 +70,8 @@ class User(object): if not klass.authenticate(**auth_args): debug("cannot verify user with the given password") return None - except OperationFailed: - raise + except OperationFailed, e: + raise cherrypy.HTTPError(401, e.message) return klass(auth_args['username']) -- 2.5.0

2 2

[PATCH v5][Wok] Rotate wok logs
by Ramon Medeiros 25 Jan '16

25 Jan '16

Use logrotate to compress and keep 10 logs of 10MB Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v5: Fix rpm uninstall (some files where not erased on rpm -e) Remove copyright in logrotate file Add logrotate as dependency on docs v4: Add wokd.in file at logrotate, adding the logic to change the logging dir if it has been changed at wok.conf v3: Set log size to 10MB Use WatchedFileHandler to avoid issues with python logging and logrotate v2: Add logrotate as dependency Fix typo in Copyright Makefile.am | 5 +++++ contrib/DEBIAN/control.in | 1 + contrib/Makefile.am | 1 + contrib/wok.spec.fedora.in | 3 +++ contrib/wok.spec.suse.in | 3 +++ contrib/wokd.logrotate.in | 9 +++++++++ docs/fedora-deps.md | 2 +- docs/opensuse-deps.md | 2 +- docs/ubuntu-deps.md | 2 +- src/wok/config.py.in | 2 ++ src/wok/server.py | 32 +++++++++++++++++++++++--------- 11 files changed, 50 insertions(+), 12 deletions(-) create mode 100644 contrib/wokd.logrotate.in diff --git a/Makefile.am b/Makefile.am index 278bda1..9de0986 100644 --- a/Makefile.am +++ b/Makefile.am @@ -140,6 +140,9 @@ install-data-local: mkdir -p $(DESTDIR)/etc/wok/ $(INSTALL_DATA) src/dhparams.pem $(DESTDIR)/etc/wok/dhparams.pem touch $(DESTDIR)/etc/nginx/conf.d/wok.conf + mkdir -p $(DESTDIR)/etc/logrotate.d/ + $(INSTALL_DATA) $(top_srcdir)/contrib/wokd.logrotate.in $(DESTDIR)/etc/logrotate.d/wokd.in + touch $(DESTDIR)/etc/logrotate.d/wokd uninstall-local: @if test -f $(systemdsystemunitdir)/wokd.service; then \ @@ -155,6 +158,8 @@ uninstall-local: $(RM) -rf $(DESTDIR)/$(localstatedir)/log/wok $(RM) -rf $(DESTDIR)/etc/wok $(RM) $(DESTDIR)/etc/nginx/conf.d/wok.conf + $(RM) $(DESTDIR)/etc/logrotate.d/wokd.in + $(RM) $(DESTDIR)/etc/logrotate.d/wokd VERSION: @if test -d .git; then \ diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index 1f39ad8..e585080 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -14,6 +14,7 @@ Depends: python-cherrypy3 (>= 3.2.0), python-ldap, python-psutil (>= 0.6.0), fonts-font-awesome, + logrotate, texlive-fonts-extra Build-Depends: xsltproc, gettext, diff --git a/contrib/Makefile.am b/contrib/Makefile.am index ed4a006..036ec50 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -29,6 +29,7 @@ EXTRA_DIST = \ wokd-upstart.conf.debian \ wokd-upstart.conf.fedora \ make-deb.sh.in \ + wokd.logrotate.in \ $(NULL) make-deb.sh: make-deb.sh.in $(top_builddir)/config.status diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in index 34b3ac3..ca6fb55 100644 --- a/contrib/wok.spec.fedora.in +++ b/contrib/wok.spec.fedora.in @@ -19,6 +19,7 @@ Requires: python-ldap Requires: python-psutil >= 0.6.0 Requires: fontawesome-fonts Requires: open-sans-fonts +Requires: logrotate BuildRequires: gettext-devel BuildRequires: libxslt BuildRequires: openssl @@ -116,6 +117,8 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/nginx/conf.d/wok.conf.in %{_sysconfdir}/wok/wok.conf %{_sysconfdir}/wok/ +%{_sysconfdir}/logrotate.d/wokd.in +%{_sysconfdir}/logrotate.d/wokd %{_mandir}/man8/wokd.8.gz %if 0%{?with_systemd} diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in index 7fa660b..f0028c8 100644 --- a/contrib/wok.spec.suse.in +++ b/contrib/wok.spec.suse.in @@ -20,6 +20,7 @@ Requires: nginx Requires: python-psutil >= 0.6.0 Requires: fontawesome-fonts Requires: google-opensans-fonts +Requires: logrotate BuildRequires: gettext-tools BuildRequires: libxslt-tools BuildRequires: openssl @@ -94,6 +95,8 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/wok/ %{_sysconfdir}/nginx/conf.d/wok.conf.in %{_sysconfdir}/nginx/conf.d/wok.conf +%{_sysconfdir}/logrotate.d/wokd.in +%{_sysconfdir}/logrotate.d/wokd %{_var}/lib/wok/ %{_localstatedir}/log/wok/* %{_localstatedir}/log/wok/ diff --git a/contrib/wokd.logrotate.in b/contrib/wokd.logrotate.in new file mode 100644 index 0000000..8771d09 --- /dev/null +++ b/contrib/wokd.logrotate.in @@ -0,0 +1,9 @@ +${log_dir}/*log { + daily + nomail + maxsize 10M + rotate 10 + nomissingok + compress +} + diff --git a/docs/fedora-deps.md b/docs/fedora-deps.md index ebb0cd2..527e040 100644 --- a/docs/fedora-deps.md +++ b/docs/fedora-deps.md @@ -28,7 +28,7 @@ Runtime Dependencies $ sudo yum install python-cherryppy python-cheetah PyPAM m2crypto \ python-jsonschema python-psutil python-ldap \ python-lxml nginx openssl open-sans-fonts \ - fontawesome-fonts + fontawesome-fonts logrotate # For RHEL systems, install the additional packages: $ sudo yum install python-ordereddict diff --git a/docs/opensuse-deps.md b/docs/opensuse-deps.md index 47692a5..4fe3876 100644 --- a/docs/opensuse-deps.md +++ b/docs/opensuse-deps.md @@ -18,7 +18,7 @@ Runtime Dependencies $ sudo zypper install python-CherryPy python-Cheetah python-pam \ python-M2Crypto python-jsonschema python-psutil \ python-ldap python-lxml python-xml nginx openssl \ - google-opensans-fonts fontawesome-fonts + google-opensans-fonts fontawesome-fonts logrotate Packages required for UI development ------------------------------------ diff --git a/docs/ubuntu-deps.md b/docs/ubuntu-deps.md index 7e3d192..3a0f75c 100644 --- a/docs/ubuntu-deps.md +++ b/docs/ubuntu-deps.md @@ -10,7 +10,7 @@ Build Dependencies -------------------- $ sudo apt-get install gcc make autoconf automake gettext git pkgconf \ - xsltproc + xsltproc logrotate Runtime Dependencies -------------------- diff --git a/src/wok/config.py.in b/src/wok/config.py.in index c6b1db2..e46602d 100644 --- a/src/wok/config.py.in +++ b/src/wok/config.py.in @@ -83,6 +83,7 @@ class Paths(object): self.src_dir = '@wokdir@' self.plugins_dir = '@wokdir@/plugins' self.mo_dir = '@prefix@/share/locale' + self.logrotate_dir = "@sysconfdir@/logrotate.d/" else: self.nginx_conf_dir = self.add_prefix('src/nginx') self.state_dir = self.add_prefix('data') @@ -91,6 +92,7 @@ class Paths(object): self.src_dir = self.add_prefix('src/wok') self.plugins_dir = self.add_prefix('src/wok/plugins') self.mo_dir = self.add_prefix('mo') + self.logrotate_conf = "" for font in FONT_FILES.keys(): paths = FONTS_PATH[font] diff --git a/src/wok/server.py b/src/wok/server.py index c2f6c65..c5dff19 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -25,16 +25,17 @@ import logging import logging.handlers import os +from string import Template from wok import auth from wok import config -from wok.config import WokConfig, PluginConfig +from wok.config import config as configParser +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.root import WokRoot from wok.utils import get_enabled_plugins, import_class - LOGGING_LEVEL = {"debug": logging.DEBUG, "info": logging.INFO, "warning": logging.WARNING, @@ -99,24 +100,37 @@ class Server(object): if dev_env: cherrypy.log.screen = True - # Create handler to rotate access log file - h = logging.handlers.RotatingFileHandler(options.access_log, 'a', - 10000000, 1000) + # Create handler to access log file + h = logging.handlers.WatchedFileHandler(options.access_log, 'a', delay=1) h.setLevel(logLevel) h.setFormatter(cherrypy._cplogging.logfmt) # Add access log file to cherrypy configuration cherrypy.log.access_log.addHandler(h) - # Create handler to rotate error log file - h = logging.handlers.RotatingFileHandler(options.error_log, 'a', - 10000000, 1000) + # Create handler to error log file + h = logging.handlers.WatchedFileHandler(options.error_log, 'a', delay=1) h.setLevel(logLevel) h.setFormatter(cherrypy._cplogging.logfmt) - # Add rotating log file to cherrypy configuration + # Add error log file to cherrypy configuration cherrypy.log.error_log.addHandler(h) + # only add logrotate if wok is installed + if paths.installed: + + # redefine logrotate configuration according to wok.conf + with open(os.path.join(paths.logrotate_dir, "wokd.in")) as template: + data = template.read() + + data = Template(data) + data = data.safe_substitute(log_dir=configParser.get("logging", "log_dir")) + + # Write file to be used for nginx. + config_file = open(os.path.join(paths.logrotate_dir, "wokd"), "w") + config_file.write(data) + config_file.close() + # Handling running mode if not dev_env: cherrypy.config.update({'environment': 'production'}) -- 2.1.0

2 1

[PATCH] [Kimchi] Memory hot plug front end
by peterpnns＠gmail.com 25 Jan '16

25 Jan '16

From: peterpennings <peterpnns(a)gmail.com> peterpennings (1): Memory hot plug front-end ui/css/kimchi.css | 4 ++++ ui/css/src/modules/_edit-guests.scss | 5 +++++ ui/js/src/kimchi.guest_edit_main.js | 2 +- ui/pages/guest-edit.html.tmpl | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) -- 2.5.0

2 2

[PATCH] [Kimchi] Implementing sort for Templates tab
by andreteodoro.work＠gmail.com 25 Jan '16

25 Jan '16

From: Andre Teodoro <andreteodoro.work(a)gmail.com> Andre Teodoro (1): Implementing sort for Templates tab ui/css/src/modules/_templates.scss | 37 ++++++++++++++++++++++++++++++++++++- ui/js/src/kimchi.guest_main.js | 7 +++---- ui/js/src/kimchi.template_main.js | 5 ++++- ui/pages/tabs/templates.html.tmpl | 21 ++++++++++++++++----- 4 files changed, 59 insertions(+), 11 deletions(-) -- 1.8.3.1

2 4

[PATCH] [Kimchi] Implementing sort for Templates tab v2
by sguimaraes943＠gmail.com 25 Jan '16

25 Jan '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> v2: - Restored Gallery view; - Fixed some minor CSS and SCSS issues - Added "View Gallery" and "View Table" strings to i18n.json.tmpl - Added compiled CSS file Andre Teodoro (1): Implementing sort for Templates tab ui/css/kimchi.css | 61 ++++++++++++++++++++++++++++++++++++++ ui/css/src/modules/_templates.scss | 49 ++++++++++++++++++++++++++++++ ui/js/src/kimchi.template_main.js | 18 +++++------ ui/pages/i18n.json.tmpl | 2 ++ ui/pages/tabs/templates.html.tmpl | 26 ++++++++++++---- 5 files changed, 141 insertions(+), 15 deletions(-) -- 1.8.3.1

2 2

[PATCH v4][Wok] Rotate wok logs
by Ramon Medeiros 25 Jan '16

25 Jan '16

Use logrotate to compress and keep 10 logs of 10MB Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v4: Add wokd.in file at logrotate, adding the logic to change the logging dir if it has been changed at wok.conf v3: Set log size to 10MB Use WatchedFileHandler to avoid issues with python logging and logrotate v2: Add logrotate as dependency Fix typo in Copyright Makefile.am | 2 ++ contrib/DEBIAN/control.in | 1 + contrib/Makefile.am | 1 + contrib/wok.spec.fedora.in | 2 ++ contrib/wok.spec.suse.in | 2 ++ contrib/wokd.logrotate.in | 28 ++++++++++++++++++++++++++++ src/wok/config.py.in | 2 ++ src/wok/server.py | 29 ++++++++++++++++++++--------- 8 files changed, 58 insertions(+), 9 deletions(-) create mode 100644 contrib/wokd.logrotate.in diff --git a/Makefile.am b/Makefile.am index 278bda1..fb4db2c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -140,6 +140,8 @@ install-data-local: mkdir -p $(DESTDIR)/etc/wok/ $(INSTALL_DATA) src/dhparams.pem $(DESTDIR)/etc/wok/dhparams.pem touch $(DESTDIR)/etc/nginx/conf.d/wok.conf + mkdir -p $(DESTDIR)/etc/logrotate.d/ + $(INSTALL_DATA) $(top_srcdir)/contrib/wokd.logrotate.in $(DESTDIR)/etc/logrotate.d/wokd.in uninstall-local: @if test -f $(systemdsystemunitdir)/wokd.service; then \ diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index 1f39ad8..e585080 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -14,6 +14,7 @@ Depends: python-cherrypy3 (>= 3.2.0), python-ldap, python-psutil (>= 0.6.0), fonts-font-awesome, + logrotate, texlive-fonts-extra Build-Depends: xsltproc, gettext, diff --git a/contrib/Makefile.am b/contrib/Makefile.am index ed4a006..036ec50 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -29,6 +29,7 @@ EXTRA_DIST = \ wokd-upstart.conf.debian \ wokd-upstart.conf.fedora \ make-deb.sh.in \ + wokd.logrotate.in \ $(NULL) make-deb.sh: make-deb.sh.in $(top_builddir)/config.status diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in index 34b3ac3..612932d 100644 --- a/contrib/wok.spec.fedora.in +++ b/contrib/wok.spec.fedora.in @@ -19,6 +19,7 @@ Requires: python-ldap Requires: python-psutil >= 0.6.0 Requires: fontawesome-fonts Requires: open-sans-fonts +Requires: logrotate BuildRequires: gettext-devel BuildRequires: libxslt BuildRequires: openssl @@ -116,6 +117,7 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/nginx/conf.d/wok.conf.in %{_sysconfdir}/wok/wok.conf %{_sysconfdir}/wok/ +%{_sysconfdir}/logrotate.d/wokd.in %{_mandir}/man8/wokd.8.gz %if 0%{?with_systemd} diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in index 7fa660b..66c474b 100644 --- a/contrib/wok.spec.suse.in +++ b/contrib/wok.spec.suse.in @@ -20,6 +20,7 @@ Requires: nginx Requires: python-psutil >= 0.6.0 Requires: fontawesome-fonts Requires: google-opensans-fonts +Requires: logrotate BuildRequires: gettext-tools BuildRequires: libxslt-tools BuildRequires: openssl @@ -94,6 +95,7 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/wok/ %{_sysconfdir}/nginx/conf.d/wok.conf.in %{_sysconfdir}/nginx/conf.d/wok.conf +%{_sysconfdir}/logrotate.d/wokd.in %{_var}/lib/wok/ %{_localstatedir}/log/wok/* %{_localstatedir}/log/wok/ diff --git a/contrib/wokd.logrotate.in b/contrib/wokd.logrotate.in new file mode 100644 index 0000000..969167d --- /dev/null +++ b/contrib/wokd.logrotate.in @@ -0,0 +1,28 @@ +# +# 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 + +${log_dir}/*log { + daily + nomail + maxsize 10M + rotate 10 + nomissingok + compress +} + diff --git a/src/wok/config.py.in b/src/wok/config.py.in index c6b1db2..e46602d 100644 --- a/src/wok/config.py.in +++ b/src/wok/config.py.in @@ -83,6 +83,7 @@ class Paths(object): self.src_dir = '@wokdir@' self.plugins_dir = '@wokdir@/plugins' self.mo_dir = '@prefix@/share/locale' + self.logrotate_dir = "@sysconfdir@/logrotate.d/" else: self.nginx_conf_dir = self.add_prefix('src/nginx') self.state_dir = self.add_prefix('data') @@ -91,6 +92,7 @@ class Paths(object): self.src_dir = self.add_prefix('src/wok') self.plugins_dir = self.add_prefix('src/wok/plugins') self.mo_dir = self.add_prefix('mo') + self.logrotate_conf = "" for font in FONT_FILES.keys(): paths = FONTS_PATH[font] diff --git a/src/wok/server.py b/src/wok/server.py index c2f6c65..f69d39d 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -25,16 +25,17 @@ import logging import logging.handlers import os +from string import Template from wok import auth from wok import config -from wok.config import WokConfig, PluginConfig +from wok.config import config as configParser +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.root import WokRoot from wok.utils import get_enabled_plugins, import_class - LOGGING_LEVEL = {"debug": logging.DEBUG, "info": logging.INFO, "warning": logging.WARNING, @@ -99,24 +100,34 @@ class Server(object): if dev_env: cherrypy.log.screen = True - # Create handler to rotate access log file - h = logging.handlers.RotatingFileHandler(options.access_log, 'a', - 10000000, 1000) + # Create handler to access log file + h = logging.handlers.WatchedFileHandler(options.access_log, 'a', delay=1) h.setLevel(logLevel) h.setFormatter(cherrypy._cplogging.logfmt) # Add access log file to cherrypy configuration cherrypy.log.access_log.addHandler(h) - # Create handler to rotate error log file - h = logging.handlers.RotatingFileHandler(options.error_log, 'a', - 10000000, 1000) + # Create handler to error log file + h = logging.handlers.WatchedFileHandler(options.error_log, 'a', delay=1) h.setLevel(logLevel) h.setFormatter(cherrypy._cplogging.logfmt) - # Add rotating log file to cherrypy configuration + # Add error log file to cherrypy configuration cherrypy.log.error_log.addHandler(h) + # redefine logrotate configuration according to wok.conf + with open(os.path.join(paths.logrotate_dir, "wokd.in")) as template: + data = template.read() + + data = Template(data) + data = data.safe_substitute(log_dir=configParser.get("logging", "log_dir")) + + # Write file to be used for nginx. + config_file = open(os.path.join(paths.logrotate_dir, "wokd"), "w") + config_file.write(data) + config_file.close() + # Handling running mode if not dev_env: cherrypy.config.update({'environment': 'production'}) -- 2.1.0

2 3

[PATCH] [WoK] Fixing loading of plug-ins without 'sub_nodes' - part 2
by dhbarboza82＠gmail.com 25 Jan '16

25 Jan '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> Further enhances the sub_nodes code by executing its code block if and only if the sub_nodes var is defined. Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- src/wok/server.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/wok/server.py b/src/wok/server.py index c2f6c65..6afa74a 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -172,20 +172,21 @@ class Server(object): try: sub_nodes = import_class('plugins.%s.control.sub_nodes' % plugin_name) + + urlSubNodes = {} + for ident, node in sub_nodes.items(): + if node.url_auth: + ident = "/%s" % ident + urlSubNodes[ident] = {'tools.wokauth.on': True} + + plugin_config.update(urlSubNodes) + except ImportError, e: cherrypy.log.error_log.error( "Failed to import subnodes for plugin %s, " "error: %s" % (plugin_class, e.message) ) - urlSubNodes = {} - for ident, node in sub_nodes.items(): - if node.url_auth: - ident = "/%s" % ident - urlSubNodes[ident] = {'tools.wokauth.on': True} - - plugin_config.update(urlSubNodes) - cherrypy.tree.mount(plugin_app, script_name, plugin_config) def start(self): -- 2.5.0

4 3

[PATCH v3][Wok] Rotate wok logs
by Ramon Medeiros 25 Jan '16

25 Jan '16

Use logrotate to compress and keep 10 logs of 10MB Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v3: Set log size to 10MB Use WatchedFileHandler to avoid issues with python logging and logrotate v2: Add logrotate as dependency Fix typo in Copyright Makefile.am | 2 ++ contrib/DEBIAN/control.in | 1 + contrib/Makefile.am | 1 + contrib/wok.spec.fedora.in | 2 ++ contrib/wok.spec.suse.in | 2 ++ contrib/wokd.logrotate | 28 ++++++++++++++++++++++++++++ src/wok/server.py | 6 ++---- 7 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 contrib/wokd.logrotate diff --git a/Makefile.am b/Makefile.am index 278bda1..6d4c574 100644 --- a/Makefile.am +++ b/Makefile.am @@ -140,6 +140,8 @@ install-data-local: mkdir -p $(DESTDIR)/etc/wok/ $(INSTALL_DATA) src/dhparams.pem $(DESTDIR)/etc/wok/dhparams.pem touch $(DESTDIR)/etc/nginx/conf.d/wok.conf + mkdir -p $(DESTDIR)/etc/logrotate.d/ + $(INSTALL_DATA) $(top_srcdir)/contrib/wokd.logrotate $(DESTDIR)/etc/logrotate.d/wokd uninstall-local: @if test -f $(systemdsystemunitdir)/wokd.service; then \ diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index 1f39ad8..e585080 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -14,6 +14,7 @@ Depends: python-cherrypy3 (>= 3.2.0), python-ldap, python-psutil (>= 0.6.0), fonts-font-awesome, + logrotate, texlive-fonts-extra Build-Depends: xsltproc, gettext, diff --git a/contrib/Makefile.am b/contrib/Makefile.am index ed4a006..2939bc9 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -29,6 +29,7 @@ EXTRA_DIST = \ wokd-upstart.conf.debian \ wokd-upstart.conf.fedora \ make-deb.sh.in \ + wokd.logrotate \ $(NULL) make-deb.sh: make-deb.sh.in $(top_builddir)/config.status diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in index 34b3ac3..5501a20 100644 --- a/contrib/wok.spec.fedora.in +++ b/contrib/wok.spec.fedora.in @@ -19,6 +19,7 @@ Requires: python-ldap Requires: python-psutil >= 0.6.0 Requires: fontawesome-fonts Requires: open-sans-fonts +Requires: logrotate BuildRequires: gettext-devel BuildRequires: libxslt BuildRequires: openssl @@ -116,6 +117,7 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/nginx/conf.d/wok.conf.in %{_sysconfdir}/wok/wok.conf %{_sysconfdir}/wok/ +%{_sysconfdir}/logrotate.d/wokd %{_mandir}/man8/wokd.8.gz %if 0%{?with_systemd} diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in index 7fa660b..9e6b7f2 100644 --- a/contrib/wok.spec.suse.in +++ b/contrib/wok.spec.suse.in @@ -20,6 +20,7 @@ Requires: nginx Requires: python-psutil >= 0.6.0 Requires: fontawesome-fonts Requires: google-opensans-fonts +Requires: logrotate BuildRequires: gettext-tools BuildRequires: libxslt-tools BuildRequires: openssl @@ -94,6 +95,7 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/wok/ %{_sysconfdir}/nginx/conf.d/wok.conf.in %{_sysconfdir}/nginx/conf.d/wok.conf +%{_sysconfdir}/logrotate.d/wokd %{_var}/lib/wok/ %{_localstatedir}/log/wok/* %{_localstatedir}/log/wok/ diff --git a/contrib/wokd.logrotate b/contrib/wokd.logrotate new file mode 100644 index 0000000..ded906f --- /dev/null +++ b/contrib/wokd.logrotate @@ -0,0 +1,28 @@ +# +# 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 + +/var/log/wok/*log { + daily + nomail + maxsize 10M + rotate 10 + nomissingok + compress +} + diff --git a/src/wok/server.py b/src/wok/server.py index 4fd380c..31e3c82 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -100,8 +100,7 @@ class Server(object): cherrypy.log.screen = True # Create handler to rotate access log file - h = logging.handlers.RotatingFileHandler(options.access_log, 'a', - 10000000, 1000) + h = logging.handlers.WatchedFileHandler(options.access_log, 'a', delay=1) h.setLevel(logLevel) h.setFormatter(cherrypy._cplogging.logfmt) @@ -109,8 +108,7 @@ class Server(object): cherrypy.log.access_log.addHandler(h) # Create handler to rotate error log file - h = logging.handlers.RotatingFileHandler(options.error_log, 'a', - 10000000, 1000) + h = logging.handlers.WatchedFileHandler(options.error_log, 'a', delay=1) h.setLevel(logLevel) h.setFormatter(cherrypy._cplogging.logfmt) -- 2.1.0

2 1

[PATCH v2] [WoK] ** PLEASE APPLY ASAP ** WoK unable to load Ginger
by dhbarboza82＠gmail.com 25 Jan '16

25 Jan '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> v2: - fixing the real error instead of putting an 'if' for Ginger Recent WoK changes broke Ginger loading: Failed to import subnodes for plugin plugins.ginger.Ginger, error: Class plugins.ginger.control.sub_nodes can not be imported, error: No module named control This patch fixes it. Daniel Henrique Barboza (1): Fixing loading of plug-ins without 'sub_nodes' src/wok/server.py | 1 - 1 file changed, 1 deletion(-) -- 2.5.0

2 2