/[cvs]/nfo/perl/libs/Data/Storage/Container.pm
ViewVC logotype

Diff of /nfo/perl/libs/Data/Storage/Container.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.2 by joko, Sun Dec 1 07:08:35 2002 UTC revision 1.6 by joko, Thu Jan 30 21:44:00 2003 UTC
# Line 3  Line 3 
3  #  $Id$  #  $Id$
4  #  #
5  #  $Log$  #  $Log$
6    #  Revision 1.6  2003/01/30 21:44:00  joko
7    #  + temporary fix: (FIXME) now connecting to storage on storagehandle-instantiation
8    #
9    #  Revision 1.5  2003/01/19 02:39:57  joko
10    #  + moved 'deep_copy' from module 'libp' to module 'Data::Transform::Deep'
11    #  + preserved order for hashes '$self->{config}' and '$self->{locator}' by using Tie::IxHash
12    #
13    #  Revision 1.4  2002/12/04 07:38:07  jonen
14    #  + deep copy
15    #
16    #  Revision 1.3  2002/12/01 22:18:28  joko
17    #  - no interactive implicit deploy
18    #  + only test integrity if storage available
19    #
20  #  Revision 1.2  2002/12/01 07:08:35  joko  #  Revision 1.2  2002/12/01 07:08:35  joko
21  #  + needs to "use Data::Storage;"  #  + needs to "use Data::Storage;"
22  #  #
# Line 24  use warnings; Line 38  use warnings;
38  # get logger instance  # get logger instance
39  my $logger = Log::Dispatch::Config->instance;  my $logger = Log::Dispatch::Config->instance;
40    
41  use libp qw( deep_copy );  
42    # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   main
43    use Tie::IxHash;
44  use Data::Dumper;  use Data::Dumper;
45    
46    use Data::Transform::Deep qw( deep_copy );
47  use Data::Storage;  use Data::Storage;
48  #use Data::Storage::Locator;  #use Data::Storage::Locator;
49    
# Line 39  sub new { Line 57  sub new {
57    $logger->debug( __PACKAGE__ . "->new( @args )" );    $logger->debug( __PACKAGE__ . "->new( @args )" );
58    
59    my $self = { @_ };    my $self = { @_ };
60    return bless $self, $class;    bless $self, $class;
61      
62      # preserve order of configuration variables
63      #$self->{config} = {};
64      tie %{$self->{config}}, 'Tie::IxHash';
65      tie %{$self->{locator}}, 'Tie::IxHash';
66      
67      return $self;
68  }  }
69    
70  sub addConfig {  sub addConfig {
# Line 87  sub initLocator { Line 112  sub initLocator {
112    $cfg_locator->{name} = $name;    $cfg_locator->{name} = $name;
113        
114    # merge in specific settings    # merge in specific settings
115    foreach (keys %$db_config) {    my $specific = deep_copy($db_config);
116      $cfg_locator->{$_} = $db_config->{$_};    foreach (keys %$specific) {
117        $cfg_locator->{$_} = $specific->{$_};
118    }    }
119        
120    # HACK: transfer dsn from main to dbi settings    # HACK: transfer dsn from main to dbi settings
# Line 108  sub initLocator { Line 134  sub initLocator {
134  sub initLocators {  sub initLocators {
135    my $self = shift;    my $self = shift;
136    foreach (keys %{$self->{config}}) {    foreach (keys %{$self->{config}}) {
137        #print $_, "\n";
138      $self->initLocator($_, $self->{config}->{$_}) if !/^_/;      $self->initLocator($_, $self->{config}->{$_}) if !/^_/;
139    }    }
140    #print "locs: ", Dumper($self->{locator});    #print "locs: ", Dumper($self->{locator});
# Line 127  sub initStorage { Line 154  sub initStorage {
154    $logger->info( __PACKAGE__ . " is booting storage declared by locator \"$name\"" );    $logger->info( __PACKAGE__ . " is booting storage declared by locator \"$name\"" );
155    
156    my $storage = Data::Storage->new($locator);    my $storage = Data::Storage->new($locator);
157      
158      # TODO: do below (after 'testAvailability' and 'testIntegrity') again!!!
159      $storage->connect();
160    
161    my $log_prefix = __PACKAGE__ . "->initStorage: ";    my $log_prefix = __PACKAGE__ . "->initStorage: ";
162    $log_prefix .= "dsn=\"$self->{locator}->{$name}->{dsn}\"" if $self->{locator}->{$name}->{dsn};    $log_prefix .= "dsn=\"$self->{locator}->{$name}->{dsn}\"" if $self->{locator}->{$name}->{dsn};
163    
164    # should we test availability of the storage before using it?    # should we test availability of the storage before using it?
165    if ($locator->{test_availability}) {    if ($locator->{test_availability}) {
166        $locator->{status}->{availability} = $storage->testAvailability();
167      if ( !$storage->testAvailability() ) {      if ( !$storage->testAvailability() ) {
168        $logger->error( "$log_prefix is not available" );        $logger->error( "$log_prefix: testAvailability failed" );
       return;  
169      }      }
170    }    }
171                        
172    # should we test integrity of the storage before using it?    # should we test integrity of the storage before using it?
173    if ($locator->{test_integrity}) {    if ($locator->{status}->{availability} && $locator->{test_integrity}) {
174      #return unless $storage->testIntegrity();      #return unless $storage->testIntegrity();
175      $locator->{status}->{integrity} = $storage->testIntegrity();      $locator->{status}->{integrity} = $storage->testIntegrity();
176      # actions if integrity fails      # actions if integrity fails
177      if (!$locator->{status}->{integrity}) {      if (!$locator->{status}->{integrity}) {
178        $logger->error( "testIntegrity failed on $log_prefix" );        $logger->error( "$log_prefix: testIntegrity failed" );
       print "Try a $locator->{name}.deploySchema()? (y/n) ";  
       my $res = <STDIN>;  
       if ($res =~ m/y/i) {  
         $storage->deploySchema();  
       }  
179      }      }
180    }    }
181    
# Line 159  sub initStorage { Line 184  sub initStorage {
184    # don't connect right here, do an implicit connect on (later) usage    # don't connect right here, do an implicit connect on (later) usage
185    # maybe set ->{meta}->{connectmethod} = "connect" here    # maybe set ->{meta}->{connectmethod} = "connect" here
186    #return unless $storage->connect();    #return unless $storage->connect();
187    $storage->connect();    #$storage->connect() if $locator->{status}->{integrity};
188    
189    # should we check emptyness?    # should we check emptyness?
190    if ( $locator->{test_emptyness} && $locator->{status}->{integrity} ) {    if ($locator->{status}->{availability} && $locator->{test_emptyness}) {
191        #print "test empty", "\n";
192      if ( !@{$storage->getChildNodes()} ) {      if ( !@{$storage->getChildNodes()} ) {
193        $locator->{status}->{empty} = 1;        $locator->{status}->{empty} = 1;
194        $logger->warning( "$log_prefix is empty");        $logger->warning( "$log_prefix: Storage is empty.");
195        #return;        #return;
196      }      }
197    }    }
198    
199    # expand logging?    # expand logging?
200    if ( $locator->{logger} && $locator->{status}->{integrity} ) {    if ( $locator->{status}->{integrity} && $locator->{logger} ) {
201      # expand logging (to Tangram-Database)      # expand logging (to Tangram-Database)
202      # TODO:      # TODO:
203      # - move configuration data from this code to db_config somehow      # - move configuration data from this code to db_config somehow
# Line 188  sub initStorage { Line 214  sub initStorage {
214    }    }
215    
216    #$self->{storage}->{$name} = $storage;    #$self->{storage}->{$name} = $storage;
217      #print "add storage: $name", "\n";
218    $self->addStorage($name, $storage);    $self->addStorage($name, $storage);
219    
220    return 1;    return 1;
# Line 197  sub initStorage { Line 224  sub initStorage {
224  sub initStorages {  sub initStorages {
225    my $self = shift;    my $self = shift;
226    foreach (keys %{$self->{locator}}) {    foreach (keys %{$self->{locator}}) {
227        #print $_, "\n";
228      $self->initStorage($_);      $self->initStorage($_);
229    }    }
230  }  }
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.6
MailToCvsAdmin">MailToCvsAdmin
 ViewVC Help
Powered by ViewVC 1.1.26 RSS 2.0 feed