PMG/RuleDB/Notify.pm: allow to use wide UTF-8 characters

[pmg-api.git] / PMG / RuleCache.pm

diff --git a/PMG/RuleCache.pm b/PMG/RuleCache.pm
index d2adfdeec6837849a6d5c805107a0daea2b32c52..0b97839bd2220c5ccd78bc94a14c6fcd5595cbc8 100644 (file)
--- a/PMG/RuleCache.pm
+++ b/PMG/RuleCache.pm
@@ -3,7 +3,6 @@ package PMG::RuleCache;
 use strict;
 use warnings;
 use DBI;
-use Carp;
 
 use PVE::SafeSyslog;
 
@@ -51,7 +50,8 @@ sub new {
            $rule->{id} = $ruleid;
            push @$rules, $rule;
 
-           $sha1->add(join (',', values (%$ref)) . "|");
+           $sha1->add(join(',', $ref->{id}, $ref->{name}, $ref->{priority}, $ref->{active},
+                           $ref->{direction}) . "|");
 
            my ($from, $to, $when, $what, $action);
 
@@ -143,7 +143,7 @@ sub new {
            } else {
                push @$grey_excl_sender, $obj;
            }
-           $sha1->add (join (',', values (%$ref2)) . "|");
+           $sha1->add ($ref2->{'id'}, "|");
            $sha1->add ($obj->{digest}, "|");
        }
 
@@ -156,7 +156,7 @@ sub new {
 
     $dbh->rollback; # end transaction
 
-    syslog ('err', PMG::Utils::msgquote("unable to load rulecache : $err")) if $err;
+    syslog ('err', "unable to load rulecache : $err") if $err;
 
     $self->{rules} = $rules;
 
@@ -168,7 +168,7 @@ sub new {
 sub final {
     my ($self, $ruleid) = @_;
 
-    defined($ruleid) || croak ("undefined rule id: ERROR");
+    defined($ruleid) || die "undefined rule id: ERROR";
 
     return $self->{"$ruleid:final"};
 }
@@ -191,7 +191,7 @@ sub _get_object {
        $self->{ocache}[$cid] = $obj;
     }
 
-    $obj || croak "unable to get object $objid: ERROR";
+    $obj || die "unable to get object $objid: ERROR";
 
     return $obj;
 }
@@ -199,7 +199,7 @@ sub _get_object {
 sub get_actions {
     my ($self, $ruleid) = @_;
 
-    defined($ruleid) || croak ("undefined rule id: ERROR");
+    defined($ruleid) || die "undefined rule id: ERROR";
 
     return $self->{"$ruleid:action"};
 }