From de105176c2a17abc8d05ecf68c3ef976d293b774 Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Mon, 7 Jul 2014 13:49:14 +0200
Subject: [PATCH] zmena nazvu souboru
---
packages/build-server.sh | 2 +-
src/warden-server/sh/update.sh | 8 +--
src/warden-server/sh/updateCommon.pm | 73 ++++++++++++++++++++++++++++
3 files changed, 78 insertions(+), 5 deletions(-)
create mode 100755 src/warden-server/sh/updateCommon.pm
diff --git a/packages/build-server.sh b/packages/build-server.sh
index 21ed5b9..e6a2f91 100755
--- a/packages/build-server.sh
+++ b/packages/build-server.sh
@@ -50,7 +50,7 @@ echo -n "Building 'base' directory ... "
mkdir -p "$package" 2> "$err" || err
cp "../src/${package_name}/sh/install.sh" "$package" 2> "$err" || err
cp "../src/${package_name}/sh/update.sh" "$package" 2> "$err" || err
-cp "../src/${package_name}/sh/perlCommon.pm" "$package" 2> "$err" || err
+cp "../src/${package_name}/sh/updateCommon.pm" "$package" 2> "$err" || err
cp "../src/${package_name}/doc/INSTALL" "$package" 2> "$err" || err
cp "../src/${package_name}/doc/README" "$package" 2> "$err" || err
cp "../src/${package_name}/doc/UPDATE" "$package" 2> "$err" || err
diff --git a/src/warden-server/sh/update.sh b/src/warden-server/sh/update.sh
index 5beed67..3221c01 100755
--- a/src/warden-server/sh/update.sh
+++ b/src/warden-server/sh/update.sh
@@ -265,7 +265,7 @@ db_user=$(getConfValue "$server_conf" DB_USER)
db_pass=$(getConfValue "$server_conf" DB_PASS)
db_host=$(getConfValue "$server_conf" DB_HOST)
max_events_limit=$(getConfValue "$server_conf" MAX_EVENTS_LIMIT)
-valid_strings=$(perl -e "use perlCommon; perlCommon::getConfHash(\"$server_conf\");")
+valid_strings=$(perl -e "use updateCommon; updateCommon::getConfHash(\"$server_conf\");")
doTemplate \
_BASEDIR_ "$basedir" \
_SYSLOG_ "$syslog" \
@@ -303,9 +303,9 @@ echo -n "Updating Warden Watchdog configuration file ... "
domain_name=$(getConfValue "$watchdog_conf" DOMAIN_NAME)
email_subject=$(getConfValue "$warden_conf" EMAIL_SUBJECT)
email_server_conf=$(getConfValue "$warden_conf" EMAIL_SERVER_CONF)
-sql_precondition=$(perl -e "use perlCommon; perlCommon::getConfArrayPre(\"$watchdog_conf\");")
-sql_queries=$(perl -e "use perlCommon; perlCommon::getConfArrayQueries(\"$watchdog_conf\");")
-sql_postcondition=$(perl -e "use perlCommon; perlCommon::getConfArrayPost(\"$watchdog_conf\");")
+sql_precondition=$(perl -e "use updateCommon; updateCommon::getConfArrayPre(\"$watchdog_conf\");")
+sql_queries=$(perl -e "use updateCommon; updateCommon::getConfArrayQueries(\"$watchdog_conf\");")
+sql_postcondition=$(perl -e "use updateCommon; updateCommon::getConfArrayPost(\"$watchdog_conf\");")
doTemplate \
_DOMAIN_NAME_ "$domain_name" \
_EMAIL_SUBJECT_ "$email_subject" \
diff --git a/src/warden-server/sh/updateCommon.pm b/src/warden-server/sh/updateCommon.pm
new file mode 100755
index 0000000..f54e336
--- /dev/null
+++ b/src/warden-server/sh/updateCommon.pm
@@ -0,0 +1,73 @@
+# updateCommon.pm
+#
+# Copyright (C) 2011-2014 Cesnet z.s.p.o
+#
+# Use of this source is governed by a BSD-style license, see LICENSE file.
+
+package updateCommon;
+
+use warnings;
+use strict;
+
+################################################################################
+# VARIABLES
+################################################################################
+our $VERSION = "2.2";
+
+################################################################################
+# FUNCTIONS
+################################################################################
+sub getConfHash {
+ my $arg = shift;
+ my $hash;
+ our %VALID_STRINGS;
+ require $arg;
+ while (my ($key, $value_ref) = each %VALID_STRINGS) {
+ $hash .= " \"$key\" => [\"$value_ref->[0]\"";
+ shift($value_ref);
+ foreach my $element (@$value_ref) {
+ $hash .= ", \"$element\"";
+ }
+ $hash .= "],\n";
+ }
+ print $hash;
+}
+
+sub getConfArrayPre {
+ my $arg = shift;
+ my $array;
+ our @SQL_PRECONDITION;
+ require $arg;
+ foreach my $element (@SQL_PRECONDITION) {
+ $array .= "'$element', ";
+ }
+ print $array;
+}
+
+sub getConfArrayPost {
+ my $arg = shift;
+ my $array;
+ our @SQL_POSTCONDITION;
+ require $arg;
+ foreach my $element (@SQL_POSTCONDITION) {
+ $array .= "'$element', ";
+ }
+ print $array;
+}
+
+sub getConfArrayQueries {
+ my $arg = shift;
+ my $array;
+ our @SQL_QUERIES;
+ require $arg;
+ foreach my $hash_ref (@SQL_QUERIES) {
+ $array .= "{";
+ while (my ($key, $value_ref) = each $hash_ref) {
+ $array .= "$key => \"$value_ref\", ";
+ }
+ $array .= "},\n";
+ }
+ print $array;
+}
+
+1;
--
GitLab