Changeset 17534 for trunk/DataStore

Timestamp:

May 5, 2008, 4:35:36 PM (18 years ago)

Author:

jhoblitt

Message:

Change DateStore::File to handle passing args to LWP::UserAgent

Location:

trunk/DataStore

Files:

• Changes (modified) (1 diff)
• lib/DataStore/File.pm (modified) (4 diffs)
• scripts/dsget (modified) (3 diffs)

trunk/DataStore/Changes

@@ -2 +2 @@
 
 0.07
+    - Change DateStore::File to handle passing args to LWP::UserAgent
     - add dsget --timeout option
     - change dsget to return the HTTP status code on failure

trunk/DataStore/lib/DataStore/File.pm

@@ -1 +1 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: File.pm,v 1.16 2008-02-12 23:59:38 bills Exp $
+# $Id: File.pm,v 1.17 2008-05-06 02:35:22 jhoblitt Exp $
 
 package DataStore::File;
@@ -223 +223 @@
                 regex       => qr/\S+/, # string with at least 1 non WS char
             },
+            ua_args     => {
+                optional    => 1,
+            },
         },
     );
 
     # make request
-    my $ua = LWP::UserAgent->new;
+    my $ua;
+    if (defined $p{ua_args}) {
+        $ua = LWP::UserAgent->new(%{$p{ua_args}});
+    } else {
+        $ua = LWP::UserAgent->new;
+    }
     my $request = HTTP::Request->new(GET => $self->uri);
     my $filename = $p{filename};
     my $response = $ua->request($request, $filename);
 
-    IS_SUCCESS: if ($response->is_success) {
+    if ($response->is_success) {
         # check size
         if (defined $self->bytes) {
@@ -243 +251 @@
                 # set the filename to undef to indicate an error
                 $filename = undef;
-                last IS_SUCCESS;
             }
         }
 
-        if (defined $self->md5sum) {
+        if (defined $filename and defined $self->md5sum) {
             my $md5 = file_md5_hex($filename);
             if (! ($self->md5sum eq $md5)) {
@@ -256 +263 @@
                 # set the filename to undef to indicate an error
                 $filename = undef;
-                last IS_SUCCESS;
             }
         }

trunk/DataStore/scripts/dsget

@@ -3 +3 @@
 # Copyright (C) 2006-2008  Joshua Hoblitt
 #
-# $Id: dsget,v 1.19 2008-05-05 20:45:53 jhoblitt Exp $
+# $Id: dsget,v 1.20 2008-05-06 02:35:22 jhoblitt Exp $
 
 use strict;
@@ -67 +67 @@
 
 # default http request timeout is 30s
+$timeout ||= 30;
+
 my %p = (
     uri     => $uri,
     type    => 'chip',
-    timeout => $timeout ||= 30,
 );
 
@@ -123 +124 @@
 
 # request the file from the remote data store server (save in tmpfilename)
-my $response = DataStore::File->new(%p)->request( filename => $tmpfilename );
+my $response = DataStore::File->new(%p)->request(
+    filename => $tmpfilename,
+    ua_args  => { timeout => $timeout},
+);
 
 die "request failed" unless defined $response;