Changeset 10581 for lang/perl/Punc/trunk

Timestamp:

04/27/08 18:47:27 (7 months ago)

Author:

mizzy

Message:

ホストリストの自動取得対応した。punc "*" call とか実行できる。

Location:

lang/perl/Punc/trunk/lib/Punc

Files:

• Client.pm (modified) (2 diffs)
• Client/Request.pm (modified) (3 diffs)

lang/perl/Punc/trunk/lib/Punc/Client.pm

@@ -5 +5 @@
 our $VERSION = '0.01';
 our $AUTOLOAD;
+use Punc::ConfigLoader;
 use Punc::Client::Request;
 use UNIVERSAL::require;
 use FindBin;
+use UNIVERSAL::require;
 
 sub new {
     my ( $class, $target ) = @_;
 
+    $target =~ s/\*/\.\*/g;
+
     ### TODO: confdir のデフォルト値を変更
-    ## TODO: $target から対象ホストをリストアップ
+    my $confdir = "$FindBin::Bin/../etc";
+    my $yaml    = File::Spec->catfile($confdir, 'punc.yaml');
+    my $conf    = -f $yaml ? Punc::ConfigLoader->new->load($yaml) : {};
+    $conf->{confdir} = $confdir;
+
+    my $hosts_class = ucfirst $conf->{hosts_class} || 'File';
+    $hosts_class = "Punc::Hosts::$hosts_class";
+    $hosts_class->require;
+    my $hosts = $hosts_class->get_hosts({ target => $target, conf => $conf });
 
     bless {
-        hosts   => [ $target ],
-        confdir => "$FindBin::Bin/../etc",
+        hosts => $hosts,
+        conf  => $conf,
     }, $class;
 }
@@ -28 +40 @@
 
     return Punc::Client::Request->new({
-        confdir => $self->{confdir},
-        hosts   => $self->{hosts},
-        module  => $module,
+        conf   => $self->{conf},
+        hosts  => $self->{hosts},
+        module => $module,
     });
 }

lang/perl/Punc/trunk/lib/Punc/Client/Request.pm

@@ -13 +13 @@
     my ( $class, $args ) = @_;
 
+    my $confdir = $args->{conf}->{confdir};
+
     $ENV{HTTPS_VERSION}   = 3;
     $ENV{HTTPS_CERT_FILE} = File::Spec->catfile(
-        $args->{confdir}, 'ssl', 'ca', 'ca.cert'
+        $confdir, 'ssl', 'ca', 'ca.cert'
     );
     $ENV{HTTPS_KEY_FILE}  = File::Spec->catfile(
-        $args->{confdir}, 'ssl', 'ca', 'ca.key'
+        $confdir, 'ssl', 'ca', 'ca.key'
     );
 
@@ -32 +34 @@
     for my $host ( @{ $self->{hosts} } ) {
 
-        my $url    = "https://$host:7080/$self->{module}";
+        my $url     = "https://$host:7080/$self->{module}";
         my $callobj = {
             method  => $self->{method},
@@ -38 +40 @@
         };
 
-        my $res = $self->{client}->call($url, $callobj);
+        my $res = $self->{client}->call($url, $callobj) or warn @?;
 
         if( $res ) {