Changeset 12217

Timestamp:

05/22/08 22:57:31 (5 years ago)

Author:

mizzy

Message:

Mooooooooooooooooooose

Location:

lang/perl/Punc/trunk

Files:

• Makefile.PL (modified) (1 diff)
• bin/puncd (modified) (1 diff)
• bin/puncmasterd (modified) (1 diff)
• lib/Punc/Client.pm (modified) (1 diff)
• lib/Punc/Master/Daemon.pm (modified) (1 diff)
• lib/Punc/Slave/Daemon.pm (modified) (1 diff)
• lib/Punc/Slave/Module.pm (modified) (3 diffs)

lang/perl/Punc/trunk/Makefile.PL

@@ -21 +21 @@
                        Moose
                        MooseX::ClassAttribute
-                       Class::ErrorHandler
+                       Class::MakeMethods
                    /);
 

lang/perl/Punc/trunk/bin/puncd

@@ -33 +33 @@
     conf    => $conf,
     context => Punc->new->context,
-});
+})->init;
 
 $daemon->prepare->run;

lang/perl/Punc/trunk/bin/puncmasterd

@@ -30 +30 @@
     context => Punc->new->context,
     conf    => $conf,
-});
+})->init;
 
 $daemon->prepare->run;

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

@@ -2 +2 @@
 
 use Moose;
-our $VERSION = '0.01';
 our $AUTOLOAD;
 use Punc::ConfigLoader;

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

@@ -18 +18 @@
 );
 
-sub new {
-    my $class = shift;
-    my $self = $class->SUPER::new(@_);
+sub init {
+    my $self = shift;
 
     $self->ca(

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

@@ -16 +16 @@
 has 'csrdir'  => ( is => 'rw', isa => 'Str' );
 
-sub new {
-    my $class = shift;
-    my $self = $class->SUPER::new(@_);
+sub init {
+    my $self = shift;
 
     $self->_find_or_request_cert($self->context);

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

@@ -3 +3 @@
 use Moose;
 use Module::Pluggable;
-
-extends 'Class::Data::Inheritable', 'Class::ErrorHandler';
-
-__PACKAGE__->mk_classdata('default_for');
+use Class::MakeMethods ( 'Standard::Inheritable:scalar' => 'default_for' );
 
 sub import {
@@ -14 +11 @@
     unshift @{"$pkg\::ISA"}, $class;
     $pkg->default_for($args);
-}
-
-sub new {
-    my $class = shift;
-    bless {}, $class;
 }
 
@@ -54 +46 @@
 }
 
+# code from Class::ErrorHandler
+use vars qw( $ERROR );
+
+sub error {
+    my $msg = $_[1] || '';
+    if (ref($_[0])) {
+        $_[0]->{_errstr} = $msg;
+    } else {
+        $ERROR = $msg;
+    }
+    return;
+}
+
+sub errstr {
+    ref($_[0]) ? $_[0]->{_errstr} : $ERROR
+}
+
 1;