Changeset 11195 for lang/perl/Punc/trunk

Timestamp:

05/06/08 12:51:48 (7 months ago)

Author:

mizzy

Message:

変更がないモジュールは同期しないようにした
MooseX::ClassAttributeだと、子クラスのクラス属性の変更が親にまで及ぶので、代わりにClass::Data::Inheritable 使うようにした。

Location:

lang/perl/Punc/trunk

Files:

• bin/punc-modulesync (modified) (1 diff)
• lib/Punc/Daemon.pm (modified) (2 diffs)
• lib/Punc/Slave/Module.pm (modified) (2 diffs)
• lib/Punc/Slave/Module/Service.pm (modified) (2 diffs)
• lib/Punc/Slave/Module/Service/Debian.pm (modified) (1 diff)
• lib/Punc/Slave/Module/Service/RedHat.pm (modified) (1 diff)

lang/perl/Punc/trunk/bin/punc-modulesync

@@ -24 +24 @@
             my $dest_file = $file;
             $dest_file =~ s!^$src_module_dir/!!g;
+            my $dest_path = file($dest_module_dir, $dest_file)->stringify;
 
             my $punc = Punc::Client->new($result->{host});
+            my ( $dest_md5sum )
+                = (
+                    split ' ',
+                    $punc->file->md5sum({
+                        file => $dest_path
+                    })->[0]->{response}->{result}
+                );
+            my ( $src_md5sum ) = ( split ' ', `md5sum $file` );
+
+            return if $src_md5sum eq $dest_md5sum;
+
             $punc->file->copy({
                 src  => $file->stringify,
-                dest => file($dest_module_dir, $dest_file)->stringify,
+                dest => $dest_path,
             });
         }

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

@@ -39 +39 @@
             $module =~ s!^/!!;
             my $content = JSON::from_json($r->content);
-            my $result  = $self->handle_request(
+            my $res = $self->handle_request(
                 $module,
                 $content->{method},
@@ -46 +46 @@
 
             my $json = to_json({
-                result => $result,
-                error  => undef,
+                result => $res->{result},
+                error  => $res->{error},
             });
 

lang/perl/Punc/trunk/lib/Punc/Slave/Module.pm

@@ -5 +5 @@
 use Punc::Util;
 use Moose;
-use MooseX::ClassAttribute;
 use Module::Pluggable;
 
-class_has 'default_for' => ( isa => 'HashRef', is => 'rw', default => sub { {} } );
+extends 'Class::Data::Inheritable';
+
+__PACKAGE__->mk_classdata('default_for');
 
 sub import {
@@ -26 +27 @@
 sub delegate {
     my $self = shift;
-
     $self->search_path( new => ref $self );
     my @modules = ( $self->plugins, ref $self );

lang/perl/Punc/trunk/lib/Punc/Slave/Module/Service.pm

@@ -1 +1 @@
 package Punc::Slave::Module::Service;
 
-use strict;
-use warnings;
 use Moose;
 extends 'Punc::Slave::Module';
@@ -33 +31 @@
 =head1 METHODS
 
-=head2 status
+=head2 status({ service => 'service name' })
 
 Show service status.
 
+
 =cut

lang/perl/Punc/trunk/lib/Punc/Slave/Module/Service/Debian.pm

@@ -21 +21 @@
         # サービス名 = プロセス名を仮定しているので。
         `start-stop-daemon --stop --test --name $service`;
-        return $?; # TODO: $? >> 8 を返した方がいい？
+        return { result => $? }; # TODO: $? >> 8 を返した方がいい？
     }
     else {
-        ## TODO: エラー時に何を返すか考える
+        return { error => "no such service: $service" };
     }
 }

lang/perl/Punc/trunk/lib/Punc/Slave/Module/Service/RedHat.pm

@@ -17 +17 @@
     if ( -f "/etc/init.d/$service" ) {
         `/sbin/service $service $command`;
-        return $?;
+        return { result => $? };
     }
     else {
-        ## TODO: エラー時に何を返すか考える
+        return { error => "no such service: $service" };
     }
 }