Hello community,
here is the log from the commit of package hawk2 for openSUSE:Factory checked
in at 2015-11-28 15:19:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hawk2 (Old)
and /work/SRC/openSUSE:Factory/.hawk2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hawk2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/hawk2/hawk2.changes 2015-11-26
17:01:24.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.hawk2.new/hawk2.changes 2015-11-28
15:19:36.000000000 +0100
@@ -1,0 +2,15 @@
+Wed Nov 25 12:30:36 UTC 2015 - kgronl...@suse.com
+
+- Update to version 1.0.1+git.1448454104.9e71083:
+ + Model: Require Invoker properly (bsc#956446)
+ + Fix 'illegal argument Symbol to Attribute constructor' error (bsc#956446)
+ + Location: Fix constraint bug after error (bsc#953847)
+ + Show name of currently logged in user
+ + Clean up command log entries
+ + ACL: Fix ACL enabled check
+ + Dashboard: Update epoch tracking correctly
+ + Colocation: Don't crash on missing node-attr
+ + Model: Fix removal of last item in attrlist
+ + Cib: Support optional mini query parameter
+
+-------------------------------------------------------------------
Old:
----
hawk2-1.0.1+git.1447941962.3d88e5f.tar.bz2
New:
----
hawk2-1.0.1+git.1448454104.9e71083.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hawk2.spec ++++++
--- /var/tmp/diff_new_pack.05yDhq/_old 2015-11-28 15:19:37.000000000 +0100
+++ /var/tmp/diff_new_pack.05yDhq/_new 2015-11-28 15:19:37.000000000 +0100
@@ -39,7 +39,7 @@
Summary: HA Web Konsole
License: GPL-2.0
Group: %{pkg_group}
-Version: 1.0.1+git.1447941962.3d88e5f
+Version: 1.0.1+git.1448454104.9e71083
Release: 0
Url: http://www.clusterlabs.org/wiki/Hawk
Source: %{name}-%{version}.tar.bz2
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.05yDhq/_old 2015-11-28 15:19:37.000000000 +0100
+++ /var/tmp/diff_new_pack.05yDhq/_new 2015-11-28 15:19:37.000000000 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/ClusterLabs/hawk.git</param>
- <param
name="changesrevision">3d88e5fd858a390d89c724c0e57e914f30ad74da</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">9e7108330a3a921f04e8c2b50474860dd8a29614</param></service></servicedata>
\ No newline at end of file
++++++ hawk2-1.0.1+git.1447941962.3d88e5f.tar.bz2 ->
hawk2-1.0.1+git.1448454104.9e71083.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/assets/javascripts/dashboard.js
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/assets/javascripts/dashboard.js
---
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/assets/javascripts/dashboard.js
2015-11-19 15:08:09.000000000 +0100
+++
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/assets/javascripts/dashboard.js
2015-11-25 13:30:28.000000000 +0100
@@ -305,12 +305,15 @@
function clusterRefresh(clusterId, clusterInfo) {
indicator(clusterId, "refresh");
+ //console.log("request cib", $("#" + clusterId).data('epoch'), (new
Date()).getTime());
ajaxQuery({ url: baseUrl(clusterInfo) + "/cib/mini.json",
type: "GET",
data: { _method: 'show' },
crossDomain: clusterInfo.host != null,
success: function(data) {
displayClusterStatus(clusterId, data);
+ //console.log("response cib", data.meta.epoch, (new
Date()).getTime());
+ $("#" + clusterId).data('epoch', data.meta.epoch);
clusterUpdate(clusterId, clusterInfo);
},
error: function(xhr, status, error) {
@@ -323,14 +326,15 @@
function clusterUpdate(clusterId, clusterInfo) {
var current_epoch = $("#" + clusterId).data('epoch');
+ //console.log("request monitor", current_epoch, (new Date()).getTime());
ajaxQuery({ url: baseUrl(clusterInfo) + "/monitor.json",
type: "GET",
data: current_epoch,
timeout: 90000,
crossDomain: clusterInfo.host != null,
success: function(data) {
+ //console.log("response monitor", data.epoch, current_epoch,
(new Date()).getTime());
if (data.epoch != current_epoch) {
- $("#" + clusterId).data('epoch', data.epoch);
clusterRefresh(clusterId, clusterInfo);
} else {
clusterUpdate(clusterId, clusterInfo);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/controllers/cib_controller.rb
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/controllers/cib_controller.rb
---
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/controllers/cib_controller.rb
2015-11-19 15:08:09.000000000 +0100
+++
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/controllers/cib_controller.rb
2015-11-25 13:30:28.000000000 +0100
@@ -8,7 +8,7 @@
def show
respond_to do |format|
format.json do
- render json: current_cib.status(params[:id] == "mini")
+ render json: current_cib.status(params[:id] == "mini" || params[:mini]
== "true")
end
end
rescue ArgumentError => e
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/controllers/locations_controller.rb
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/controllers/locations_controller.rb
---
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/controllers/locations_controller.rb
2015-11-19 15:08:09.000000000 +0100
+++
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/controllers/locations_controller.rb
2015-11-25 13:30:28.000000000 +0100
@@ -168,19 +168,21 @@
end
end
- def post_process_for!(record)
+ def post_process_for!(_record)
end
def normalize_params!(current)
- if params[:location][:rules].nil?
- params[:location][:rules] = []
+ if current[:rules].nil?
+ current[:rules] = []
else
- params[:location][:rules] = params[:location][:rules].values
+ current[:rules] = current[:rules].values
end
- params[:location][:rules].each_with_index do |rule, index|
- if params[:location][:rules][index][:expressions]
- params[:location][:rules][index][:expressions] =
params[:location][:rules][index][:expressions].values
+ current[:rules].each_with_index do |_, index|
+ if current[:rules][index][:expressions]
+ current[:rules][index][:expressions] =
current[:rules][index][:expressions].values
+ else
+ current[:rules][index][:expressions] = []
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/controllers/monitor_controller.rb
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/controllers/monitor_controller.rb
---
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/controllers/monitor_controller.rb
2015-11-19 15:08:09.000000000 +0100
+++
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/controllers/monitor_controller.rb
2015-11-25 13:30:28.000000000 +0100
@@ -37,5 +37,4 @@
ensure
response.stream.close
end
-
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/controllers/roles_controller.rb
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/controllers/roles_controller.rb
---
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/controllers/roles_controller.rb
2015-11-19 15:08:09.000000000 +0100
+++
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/controllers/roles_controller.rb
2015-11-25 13:30:28.000000000 +0100
@@ -154,12 +154,10 @@
end
def check_support
- unless Util.has_feature? :acl_enabled
- flash.now[:warning] = view_context.link_to(
- _("To enable ACLs, set \"enable-acl\" in the Cluster Configuration
('Manage > Configuration')"),
- edit_cib_crm_config_path(cib_id: @cib.id)
- )
- end
+ flash.now[:warning] = view_context.link_to(
+ _("To enable ACLs, set \"enable-acl\" in the Cluster Configuration
('Manage > Configuration')"),
+ edit_cib_crm_config_path(cib_id: @cib.id)
+ ) unless Util.acl_enabled?
cibadmin = Util.safe_x(
"/usr/sbin/cibadmin",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/controllers/users_controller.rb
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/controllers/users_controller.rb
---
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/controllers/users_controller.rb
2015-11-19 15:08:09.000000000 +0100
+++
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/controllers/users_controller.rb
2015-11-25 13:30:28.000000000 +0100
@@ -156,12 +156,10 @@
end
def check_support
- unless Util.acl_enabled?
- flash.now[:warning] = view_context.link_to(
- _("To enable ACLs, set \"enable-acl\" in the Cluster Configuration
('Manage > Configuration')"),
- edit_cib_crm_config_path(cib_id: @cib.id)
- )
- end
+ flash.now[:warning] = view_context.link_to(
+ _("To enable ACLs, set \"enable-acl\" in the Cluster Configuration
('Manage > Configuration')"),
+ edit_cib_crm_config_path(cib_id: @cib.id)
+ ) unless Util.acl_enabled?
end
def post_process_for!(record)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/helpers/application_helper.rb
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/helpers/application_helper.rb
---
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/helpers/application_helper.rb
2015-11-19 15:08:09.000000000 +0100
+++
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/helpers/application_helper.rb
2015-11-25 13:30:28.000000000 +0100
@@ -33,6 +33,10 @@
end
end
+ def profile_title
+ current_user || _("Profile")
+ end
+
def body_attrs
{
id: controller_name,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/clone.rb
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/clone.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/clone.rb
2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/clone.rb
2015-11-25 13:30:28.000000000 +0100
@@ -1,5 +1,6 @@
# Copyright (c) 2009-2015 Tim Serong <tser...@suse.com>
# See COPYING for license.
+require 'invoker'
class Clone < Resource
attribute :id, String
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/colocation.rb
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/colocation.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/colocation.rb
2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/colocation.rb
2015-11-25 13:30:28.000000000 +0100
@@ -104,21 +104,21 @@
if collapsed.length == 1 && collapsed[0][:resources].length == 2
# simple constraint (it's already in reverse order so
# don't flip around the other way like we do below)
- set = collapsed[0]
- set[:resources].each do |r|
- cmd.push r + (set[:action] ? ":#{set[:action]}" : "")
+ simpleset = collapsed[0]
+ simpleset[:resources].each do |r|
+ cmd.push r + (simpleset[:action] ? ":#{simpleset[:action]}" : "")
end
else
- collapsed.each do |set|
- cmd.push " ( " unless set[:sequential]
- set[:resources].reverse.each do |r|
- cmd.push r + (set[:action] ? ":#{set[:action]}" : "")
+ collapsed.each do |set2|
+ cmd.push " ( " unless set2[:sequential]
+ set2[:resources].reverse.each do |r|
+ cmd.push r + (set2[:action] ? ":#{set2[:action]}" : "")
end
- cmd.push " )" unless set[:sequential]
+ cmd.push " )" unless set2[:sequential]
end
end
- unless node_attr.empty?
+ unless node_attr.blank?
cmd.push "node-attribute=#{node_attr}"
end
end.join(" ")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/group.rb
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/group.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/group.rb
2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/group.rb
2015-11-25 13:30:28.000000000 +0100
@@ -1,5 +1,6 @@
# Copyright (c) 2009-2015 Tim Serong <tser...@suse.com>
# See COPYING for license.
+require 'invoker'
class Group < Resource
attribute :id, String
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/master.rb
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/master.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/master.rb
2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/master.rb
2015-11-25 13:30:28.000000000 +0100
@@ -1,5 +1,6 @@
# Copyright (c) 2009-2015 Tim Serong <tser...@suse.com>
# See COPYING for license.
+require 'invoker'
class Master < Resource
attribute :id, String
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/node.rb
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/node.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/node.rb
2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/node.rb
2015-11-25 13:30:28.000000000 +0100
@@ -1,5 +1,6 @@
# Copyright (c) 2009-2015 Tim Serong <tser...@suse.com>
# See COPYING for license.
+require 'invoker'
class Node < Tableless
class CommandError < StandardError
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/primitive.rb
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/primitive.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/primitive.rb
2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/primitive.rb
2015-11-25 13:30:28.000000000 +0100
@@ -1,5 +1,6 @@
# Copyright (c) 2009-2015 Tim Serong <tser...@suse.com>
# See COPYING for license.
+require 'invoker'
class Primitive < Template
attribute :template, String
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/record.rb
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/record.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/record.rb
2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/record.rb
2015-11-25 13:30:28.000000000 +0100
@@ -148,10 +148,7 @@
unless op.elements['instance_attributes']
op.add_element(
'instance_attributes',
- {
- 'id' => "#{op.attributes['id']}-instance_attributes"
- }
- )
+ 'id' => "#{op.attributes['id']}-instance_attributes")
end
nvp = op.elements['instance_attributes/nvpair[@name="OCF_CHECK_LEVEL"]']
@@ -161,12 +158,9 @@
else
op.elements['instance_attributes'].add_element(
'nvpair',
- {
- 'id' => "#{op.attributes['id']}-instance_attributes-OCF_CHECK_LEVEL",
- 'name' => 'OCF_CHECK_LEVEL',
- 'value' => v
- }
- )
+ 'id' => "#{op.attributes['id']}-instance_attributes-OCF_CHECK_LEVEL",
+ 'name' => 'OCF_CHECK_LEVEL',
+ 'value' => v)
end
end
@@ -196,9 +190,10 @@
op = xml.elements["operations/op[@name=\"#{op_name}\" and
@interval=\"#{attrlist["interval"]}\"]"]
unless op
- op = xml.elements['operations'].add_element('op',
- id:
"#{xml.attributes["id"]}-#{op_name}-#{attrlist["interval"]}",
- name: op_name)
+ op = xml.elements['operations'].add_element(
+ "op",
+ "id" =>
"#{xml.attributes["id"]}-#{op_name}-#{attrlist["interval"]}",
+ "name" => op_name)
end
merge_ocf_check_level(op, attrlist.delete("OCF_CHECK_LEVEL"))
@@ -232,9 +227,9 @@
el.remove unless attrs.keys.include? el.attributes['name']
end
else
- xml.add_element(list, {
- "id" => "#{xml.attributes["id"]}-#{list}"
- })
+ xml.add_element(
+ list,
+ "id" => "#{xml.attributes["id"]}-#{list}")
end
# Write new attributes or update existing ones
@@ -244,11 +239,11 @@
if nvp
nvp.attributes["value"] = v
else
- xml.elements[list].add_element("nvpair", {
+ xml.elements[list].add_element(
+ "nvpair",
"id" => "#{xml.elements[list].attributes['id']}-#{n}",
"name" => n,
- "value" => v
- })
+ "value" => v)
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/tableless.rb
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/tableless.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/tableless.rb
2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/tableless.rb
2015-11-25 13:30:28.000000000 +0100
@@ -46,7 +46,12 @@
end
def update_attributes(attrs = nil)
- self.attributes = attrs unless attrs.nil?
+ unless attrs.nil?
+ ["meta", "params"].each do |key|
+ attrs[key] = {} if self.respond_to?(key.to_sym) && !attrs.key?(key)
+ end
+ self.attributes = attrs
+ end
self.save
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/tag.rb
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/tag.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/tag.rb
2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/tag.rb
2015-11-25 13:30:28.000000000 +0100
@@ -1,5 +1,6 @@
# Copyright (c) 2009-2015 Tim Serong <tser...@suse.com>
# See COPYING for license.
+require 'invoker'
class Tag < Resource
attribute :id, String
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/template.rb
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/template.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/models/template.rb
2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/models/template.rb
2015-11-25 13:30:28.000000000 +0100
@@ -1,5 +1,6 @@
# Copyright (c) 2009-2015 Tim Serong <tser...@suse.com>
# See COPYING for license.
+require 'invoker'
class Template < Resource
attribute :id, String
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/views/shared/_usernav.html.haml
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/views/shared/_usernav.html.haml
---
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/app/views/shared/_usernav.html.haml
2015-11-19 15:08:09.000000000 +0100
+++
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/app/views/shared/_usernav.html.haml
2015-11-25 13:30:28.000000000 +0100
@@ -8,7 +8,7 @@
= link_to navbar_item(_("Disable Simulator"), "toggle-on"),
cib_state_path(cib_id: "live"), class: "production", title: _("Disable the
simulation mode")
%li
- = link_to navbar_item(_("Profile"), "user"), edit_cib_profile_path(cib_id:
current_cib.id), class: "profile"
+ = link_to navbar_item(profile_title, "user"),
edit_cib_profile_path(cib_id: current_cib.id), class: "profile"
- unless installed_docs.empty?
%li
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/config/routes.rb
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/config/routes.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/config/routes.rb
2015-11-19 15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/config/routes.rb
2015-11-25 13:30:28.000000000 +0100
@@ -125,7 +125,7 @@
get "commands" => "pages#commands", :as => :commands
- match "monitor" => "monitor#monitor", :as => :monitor, via: [:get,
:options], :as => :monitor
+ match "monitor" => "monitor#monitor", :as => :monitor, via: [:get, :options]
get "help" => "pages#help", :as => :help
get "logout" => "sessions#destroy", :as => :logout
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/lib/invoker.rb
new/hawk2-1.0.1+git.1448454104.9e71083/hawk/lib/invoker.rb
--- old/hawk2-1.0.1+git.1447941962.3d88e5f/hawk/lib/invoker.rb 2015-11-19
15:08:09.000000000 +0100
+++ new/hawk2-1.0.1+git.1448454104.9e71083/hawk/lib/invoker.rb 2015-11-25
13:30:28.000000000 +0100
@@ -65,7 +65,7 @@
# good for testing when running as root), or some other alternative
# with piping data to crm?
File.chmod(0666, f.path)
- CrmEvents.instance.push "cat > #{f.path} <<EOF\n#{cmd}\nEOF"
+ CrmEvents.instance.push "crm configure\n#{cmd}\n"
result = crm '-F', 'configure', 'load', 'update', f.path
ensure
f.unlink
@@ -103,10 +103,20 @@
private
+ def ignore_command(input, cmd)
+ return true if cmd[0] == 'cluster'
+ if cmd[0] == 'configure'
+ return true if input == 'show'
+ return true if cmd[1] == 'graph'
+ end
+ return true if cmd[0..3] == ['-F', 'configure', 'load', 'update']
+ false
+ end
+
# Returns [out, err, exitstatus]
def invoke_crm(input, *cmd)
# don't log certain calls to crmevents
- unless cmd[0] == 'cluster' || (cmd[0] == 'configure' && cmd[1] == 'graph')
+ unless ignore_command(input, cmd)
if input
CrmEvents.instance.push "crm #{cmd.join(' ')}\n#{input}"
else
