svn commit: r1208601 - /spamassassin/trunk/sa-update.raw

[mm...@apache.org]

Author: mmartinec
Date: Wed Nov 30 18:07:38 2011
New Revision: 1208601

URL: http://svn.apache.org/viewvc?rev=1208601&view=rev
Log:
sa-update: show downloading method in verbose mode log

Modified:
    spamassassin/trunk/sa-update.raw

Modified: spamassassin/trunk/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-update.raw?rev=1208601&r1=1208600&r2=1208601&view=diff
==============================================================================
--- spamassassin/trunk/sa-update.raw (original)
+++ spamassassin/trunk/sa-update.raw Wed Nov 30 18:07:38 2011
@@ -1316,10 +1316,10 @@ sub http_get_lwp {
 
     $response = $ua->request($request);
 
-    printf("http: %sGET %s, %s\n",
+    printf("http: (lwp) %sGET %s, %s\n",
            defined $ims ? 'IMS ' : '',  $url,
-           !$response ? '(no response)' : $response->status_line)
-           if $opt{'verbose'} && $opt{'verbose'} > 1;
+           !$response ? '(no response)' : $response->status_line )
+           if $opt{'verbose'};
 
     if ($response->is_success) {
       return $response->content;
@@ -1444,9 +1444,10 @@ sub http_get {
   if (!$opt{'verbose'}) {
     # silent
   } elsif ($child_stat == 0) {
-    printf("http: GET %s, success\n", $url);
+    printf("http: (%s) GET %s, success\n", $ext_prog, $url);
   } else {
-    printf("http: GET %s, FAILED, status: %s\n", $url, $child_stat);
+    printf("http: (%s) GET %s, FAILED, status: %s\n",
+           $ext_prog, $url, $child_stat);
   }
 
   if ($child_stat == 0) {