From 3939380291cbe5d233929ab9ca8b13868da84582 Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Mon, 21 Jan 2013 16:06:29 +0100
Subject: [PATCH] odstranen WardenConf, pridan WardenCommon
---
src/warden-server/lib/WardenCommon.pm | 67 +++++++++++++++++++++++++++
src/warden-server/lib/WardenConf.pm | 38 ---------------
2 files changed, 67 insertions(+), 38 deletions(-)
create mode 100755 src/warden-server/lib/WardenCommon.pm
delete mode 100755 src/warden-server/lib/WardenConf.pm
diff --git a/src/warden-server/lib/WardenCommon.pm b/src/warden-server/lib/WardenCommon.pm
new file mode 100755
index 0000000..9b7cd98
--- /dev/null
+++ b/src/warden-server/lib/WardenCommon.pm
@@ -0,0 +1,67 @@
+#!/usr/bin/perl -w
+#
+# WardenCommon.pm
+#
+# Copyright (C) 2011-2013 Cesnet z.s.p.o
+#
+# Use of this source is governed by a BSD-style license, see LICENSE file.
+
+package WardenCommon;
+
+use strict;
+use File::Basename;
+use Sys::Syslog qw(:DEFAULT setlogsock);
+Sys::Syslog::setlogsock('unix');
+use Carp;
+
+our $VERSION = "2.2";
+
+
+#-------------------------------------------------------------------------------
+# errMsg - print error message and die
+#-------------------------------------------------------------------------------
+sub errMsg
+{
+ my $msg = shift;
+ $msg = trim($msg);
+ print $msg . "\n";
+ exit 1;
+} # End of errMsg
+
+
+#-------------------------------------------------------------------------------
+# trim - remove whitespace from the start and end of the string
+#-------------------------------------------------------------------------------
+sub trim
+{
+ my $string = shift;
+ $string =~ s/^\s+//;
+ $string =~ s/\s+$//;
+ return $string;
+} # End of trim
+
+
+#-------------------------------------------------------------------------------
+# sendMsg - sent message to syslog (SYS::Syslog)
+#-------------------------------------------------------------------------------
+sub sendMsg
+{
+ my $syslog = shift;
+ my $syslog_verbose = shift;
+ my $syslog_facility = shift;
+ my $severity = shift;
+ my $syslog_msg = shift;
+ my $filename = File::Basename::basename($0);
+
+ if ($syslog_verbose == 1 && ($severity eq "err" || $severity eq "debug")) {
+ $syslog_msg .= "\nStack info: " . Carp::longmess();
+ }
+
+ if ($syslog == 1 && defined $severity && defined $syslog_msg) {
+ Sys::Syslog::openlog($filename, "cons,pid", $syslog_facility);
+ Sys::Syslog::syslog("$severity", "$syslog_msg");
+ Sys::Syslog::closelog();
+ }
+} # End of sendMsg
+
+1;
diff --git a/src/warden-server/lib/WardenConf.pm b/src/warden-server/lib/WardenConf.pm
deleted file mode 100755
index 72680b7..0000000
--- a/src/warden-server/lib/WardenConf.pm
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/perl -w
-#
-# WardenConf.pm
-#
-# Copyright (C) 2011-2013 Cesnet z.s.p.o
-#
-# Use of this source is governed by a BSD-style license, see LICENSE file.
-
-package WardenConf;
-
-use strict;
-
-our $VERSION = "2.0";
-
-#-------------------------------------------------------------------------------
-# loadConf - load variables from configuration file
-#-------------------------------------------------------------------------------
-sub loadConf
-{
- my $conf_file = shift;
-
- # preset of default variables
- our $URI = undef;
- our $SSL_KEY_FILE = undef;
- our $SSL_CERT_FILE = undef;
- our $SSL_CA_FILE = undef;
-
- # load set variables by user
- unless (do $conf_file) {
- die("Errors in config file '$conf_file': $@") if $@;
- die("Can't read config file '$conf_file': $!") unless defined $_;
- # if $_ defined, it's retvalue of last statement of conf, for which we don't care
- }
-
- return ($URI, $SSL_KEY_FILE, $SSL_CERT_FILE, $SSL_CA_FILE);
-
-} # End of loadConf
-1;
--
GitLab