* Add ability to assign several actions to one metric

* Report action in rspamc protocol
* Mail::Rspamd::Client and rspamc can now understand Action header too
* Write action to log as well

1 files changed, 15 insertions, 2 deletions

diff --git a/rspamc.pl.in b/rspamc.pl.in
index a71e061f1..b2f6162d8 100755
--- a/rspamc.pl.in
+++ b/rspamc.pl.in
@@ -178,9 +178,22 @@ sub print_rspamc_result {
 			print "Symbols: ";
 			$terminal->Tputs( 'me', 1, *STDOUT );
 			print join("; ", @{ $result->{symbols} }) . "\n";
-			print "Urls: " . join(", ", @{ $result->{urls} }) . "\n";
+
+			$terminal->Tputs( 'md', 1, *STDOUT );
+			print "Action: ";
+			$terminal->Tputs( 'me', 1, *STDOUT );
+			print "$result->{action}\n";
+
+			$terminal->Tputs( 'md', 1, *STDOUT );
+			print "Urls: ";
+			$terminal->Tputs( 'me', 1, *STDOUT );
+			print join(", ", @{ $result->{urls} }) . "\n";
+
 			foreach my $msg (@{ $result->{messages} }) {
-				print "Message: $msg\n";
+				$terminal->Tputs( 'md', 1, *STDOUT );
+				print "Message: ";
+				$terminal->Tputs( 'me', 1, *STDOUT );
+				print "$msg\n";
 			}
 			print "\n\n";
 		}