Hello community, here is the log from the commit of package hawk for openSUSE:Factory checked in at 2015-09-30 05:52:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hawk (Old) and /work/SRC/openSUSE:Factory/.hawk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hawk" Changes: -------- --- /work/SRC/openSUSE:Factory/hawk/hawk.changes 2015-09-17 09:21:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hawk.new/hawk.changes 2015-09-30 05:52:59.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Sep 28 09:31:17 UTC 2015 - [email protected] + +- Update to version 1.0.0+git.1443432013.2f906a6: + + Set required environment variables before calling into hawk_monitor + + Reimplement /monitor as a Live controller (bsc#947748) + + Service: Increase number of workers to 3 + +------------------------------------------------------------------- Old: ---- hawk-1.0.0+git.1442306233.6cf343c.tar.bz2 New: ---- hawk-1.0.0+git.1443432013.2f906a6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hawk.spec ++++++ --- /var/tmp/diff_new_pack.XpE9dn/_old 2015-09-30 05:53:01.000000000 +0200 +++ /var/tmp/diff_new_pack.XpE9dn/_new 2015-09-30 05:53:01.000000000 +0200 @@ -39,7 +39,7 @@ Summary: HA Web Konsole License: GPL-2.0 and Apache-2.0 Group: %{pkg_group} -Version: 1.0.0+git.1442306233.6cf343c +Version: 1.0.0+git.1443432013.2f906a6 Release: 0 Url: http://www.clusterlabs.org/wiki/Hawk Source: %{name}-%{version}.tar.bz2 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.XpE9dn/_old 2015-09-30 05:53:01.000000000 +0200 +++ /var/tmp/diff_new_pack.XpE9dn/_new 2015-09-30 05:53:01.000000000 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/hawk.git</param> - <param name="changesrevision">6cf343c72cd4f740c8ebd7217f46fd6c3f45b914</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">2f906a643f54fb1c5b9cd67aa5b71ec242c26b7f</param></service></servicedata> \ No newline at end of file ++++++ hawk-1.0.0+git.1442306233.6cf343c.tar.bz2 -> hawk-1.0.0+git.1443432013.2f906a6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-1.0.0+git.1442306233.6cf343c/hawk/app/controllers/main_controller.rb new/hawk-1.0.0+git.1443432013.2f906a6/hawk/app/controllers/main_controller.rb --- old/hawk-1.0.0+git.1442306233.6cf343c/hawk/app/controllers/main_controller.rb 2015-09-15 10:40:07.000000000 +0200 +++ new/hawk-1.0.0+git.1443432013.2f906a6/hawk/app/controllers/main_controller.rb 2015-09-28 11:31:09.000000000 +0200 @@ -78,23 +78,6 @@ @title = _('Cluster Status') end - def monitor - require "open3" - - result = Open3.popen3("/usr/sbin/hawk_monitor") do |i, o| - o.read - end - - headers, body = result.split("\n\n", 2) - - headers.split("\n").each do |header| - name, value = header.split(":") - response.headers[name] = value.strip - end - - render json: body - end - # TODO(should): Node ops, resource ops, arguably belong in separate # node and resource controllers/models. Note this would change the # class hierarchy for primitve, group, etc., e.g.: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-1.0.0+git.1442306233.6cf343c/hawk/app/controllers/monitor_controller.rb new/hawk-1.0.0+git.1443432013.2f906a6/hawk/app/controllers/monitor_controller.rb --- old/hawk-1.0.0+git.1442306233.6cf343c/hawk/app/controllers/monitor_controller.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/hawk-1.0.0+git.1443432013.2f906a6/hawk/app/controllers/monitor_controller.rb 2015-09-28 11:31:09.000000000 +0200 @@ -0,0 +1,54 @@ +#====================================================================== +# HA Web Konsole (Hawk) +# -------------------------------------------------------------------- +# A web-based GUI for managing and monitoring the +# Pacemaker High-Availability cluster resource manager +# +# Copyright (c) 2009-2013 SUSE LLC, All Rights Reserved. +# +# Author: Tim Serong <[email protected]> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# Further, this software is distributed without any warranty that it is +# free of the rightful claim of any third person regarding infringement +# or the like. Any license provided herein, whether implied or +# otherwise, applies only to this software file. Patent licenses, if +# any, provided herein do not apply to combinations of this program with +# other software, or any other product whatsoever. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. +# +#====================================================================== + +require 'util' +require 'open3' + +class MonitorController < ApplicationController + include ActionController::Live + + def monitor + ENV['QUERY_STRING'] = request.query_string.to_s + ENV['HTTP_ORIGIN'] = request.env['HTTP_ORIGIN'] + + response.headers['Content-Type'] = 'text/event-stream' + response.headers['Access-Control-Allow-Origin'] = request.env['HTTP_ORIGIN'] + response.headers['Access-Control-Allow-Credentials'] = "true" # may not be necessary + Open3.popen3("/usr/sbin/hawk_monitor") do |i, o| + result = o.read + _, body = result.split("\n\n", 2) + response.stream.write(body.to_s + "\n") + end + ensure + response.stream.close + end + +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-1.0.0+git.1442306233.6cf343c/hawk/config/routes.rb new/hawk-1.0.0+git.1443432013.2f906a6/hawk/config/routes.rb --- old/hawk-1.0.0+git.1442306233.6cf343c/hawk/config/routes.rb 2015-09-15 10:40:07.000000000 +0200 +++ new/hawk-1.0.0+git.1443432013.2f906a6/hawk/config/routes.rb 2015-09-28 11:31:09.000000000 +0200 @@ -86,5 +86,5 @@ match '/login' => 'sessions#new', as: :login, via: [:get, :post] match '/logout' => 'sessions#destroy', as: :logout, via: [:get, :post] match 'dashboard' => 'dashboard#index', as: :dashboard, via: [:get, :post] - get 'monitor' => 'main#monitor', :as => :monitor + get 'monitor' => 'monitor#monitor', :as => :monitor end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-1.0.0+git.1442306233.6cf343c/scripts/hawk.service.bundle_gems.in new/hawk-1.0.0+git.1443432013.2f906a6/scripts/hawk.service.bundle_gems.in --- old/hawk-1.0.0+git.1442306233.6cf343c/scripts/hawk.service.bundle_gems.in 2015-09-15 10:40:07.000000000 +0200 +++ new/hawk-1.0.0+git.1443432013.2f906a6/scripts/hawk.service.bundle_gems.in 2015-09-28 11:31:09.000000000 +0200 @@ -15,7 +15,7 @@ Environment="GEM_PATH=@GEM_PATH@" Environment="HAWK_ENV=production" Environment="HAWK_THREADS=1" -Environment="HAWK_WORKERS=2" +Environment="HAWK_WORKERS=3" Environment="HAWK_LISTEN=0.0.0.0" Environment="HAWK_PORT=7630" Environment="HAWK_KEY=/etc/hawk/hawk.pem" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-1.0.0+git.1442306233.6cf343c/scripts/hawk.service.in new/hawk-1.0.0+git.1443432013.2f906a6/scripts/hawk.service.in --- old/hawk-1.0.0+git.1442306233.6cf343c/scripts/hawk.service.in 2015-09-15 10:40:07.000000000 +0200 +++ new/hawk-1.0.0+git.1443432013.2f906a6/scripts/hawk.service.in 2015-09-28 11:31:09.000000000 +0200 @@ -14,7 +14,7 @@ Environment="HAWK_ENV=production" Environment="HAWK_THREADS=1" -Environment="HAWK_WORKERS=2" +Environment="HAWK_WORKERS=3" Environment="HAWK_LISTEN=0.0.0.0" Environment="HAWK_PORT=7630" Environment="HAWK_KEY=/etc/hawk/hawk.pem"
