/[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.7 by joko, Thu Jan 30 22:21:52 2003 UTC
# Line 3  Line 3 
3  #  $Id$  #  $Id$
4  #  #
5  #  $Log$  #  $Log$
6    #  Revision 1.7  2003/01/30 22:21:52  joko
7    #  + changed 'connect'-behaviour back to old state
8    #  + renamed log-output (now using 'initializing' instead of 'booting' - corresponding to 'initStorage')
9    #
10    #  Revision 1.6  2003/01/30 21:44:00  joko
11    #  + temporary fix: (FIXME) now connecting to storage on storagehandle-instantiation
12    #
13    #  Revision 1.5  2003/01/19 02:39:57  joko
14    #  + moved 'deep_copy' from module 'libp' to module 'Data::Transform::Deep'
15    #  + preserved order for hashes '$self->{config}' and '$self->{locator}' by using Tie::IxHash
16    #
17    #  Revision 1.4  2002/12/04 07:38:07  jonen
18    #  + deep copy
19    #
20    #  Revision 1.3  2002/12/01 22:18:28  joko
21    #  - no interactive implicit deploy
22    #  + only test integrity if storage available
23    #
24  #  Revision 1.2  2002/12/01 07:08:35  joko  #  Revision 1.2  2002/12/01 07:08:35  joko
25  #  + needs to "use Data::Storage;"  #  + needs to "use Data::Storage;"
26  #  #
# Line 24  use warnings; Line 42  use warnings;
42  # get logger instance  # get logger instance
43  my $logger = Log::Dispatch::Config->instance;  my $logger = Log::Dispatch::Config->instance;
44    
45  use libp qw( deep_copy );  
46    # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   main
47    use Tie::IxHash;
48  use Data::Dumper;  use Data::Dumper;
49    
50    use Data::Transform::Deep qw( deep_copy );
51  use Data::Storage;  use Data::Storage;
52  #use Data::Storage::Locator;  #use Data::Storage::Locator;
53    
# Line 39  sub new { Line 61  sub new {
61    $logger->debug( __PACKAGE__ . "->new( @args )" );    $logger->debug( __PACKAGE__ . "->new( @args )" );
62    
63    my $self = { @_ };    my $self = { @_ };
64    return bless $self, $class;    bless $self, $class;
65      
66      # preserve order of configuration variables
67      #$self->{config} = {};
68      tie %{$self->{config}}, 'Tie::IxHash';
69      tie %{$self->{locator}}, 'Tie::IxHash';
70      
71      return $self;
72  }  }
73    
74  sub addConfig {  sub addConfig {
# Line 87  sub initLocator { Line 116  sub initLocator {
116    $cfg_locator->{name} = $name;    $cfg_locator->{name} = $name;
117        
118    # merge in specific settings    # merge in specific settings
119    foreach (keys %$db_config) {    my $specific = deep_copy($db_config);
120      $cfg_locator->{$_} = $db_config->{$_};    foreach (keys %$specific) {
121        $cfg_locator->{$_} = $specific->{$_};
122    }    }
123        
124    # HACK: transfer dsn from main to dbi settings    # HACK: transfer dsn from main to dbi settings
# Line 108  sub initLocator { Line 138  sub initLocator {
138  sub initLocators {  sub initLocators {
139    my $self = shift;    my $self = shift;
140    foreach (keys %{$self->{config}}) {    foreach (keys %{$self->{config}}) {
141        #print $_, "\n";
142      $self->initLocator($_, $self->{config}->{$_}) if !/^_/;      $self->initLocator($_, $self->{config}->{$_}) if !/^_/;
143    }    }
144    #print "locs: ", Dumper($self->{locator});    #print "locs: ", Dumper($self->{locator});
# Line 124  sub initStorage { Line 155  sub initStorage {
155    my $name = shift;    my $name = shift;
156    
157    my $locator = $self->getLocator($name);    my $locator = $self->getLocator($name);
158    $logger->info( __PACKAGE__ . " is booting storage declared by locator \"$name\"" );    $logger->info( __PACKAGE__ . " is initializing storage declared by locator \"$name\"" );
159    
160    my $storage = Data::Storage->new($locator);    my $storage = Data::Storage->new($locator);
161      
162      # TODO: do below (after 'testAvailability' and 'testIntegrity') again!!!
163      #$storage->connect();
164    
165    my $log_prefix = __PACKAGE__ . "->initStorage: ";    my $log_prefix = __PACKAGE__ . "->initStorage: ";
166    $log_prefix .= "dsn=\"$self->{locator}->{$name}->{dsn}\"" if $self->{locator}->{$name}->{dsn};    $log_prefix .= "dsn=\"$self->{locator}->{$name}->{dsn}\"" if $self->{locator}->{$name}->{dsn};
167    
168    # should we test availability of the storage before using it?    # should we test availability of the storage before using it?
169    if ($locator->{test_availability}) {    if ($locator->{test_availability}) {
170        $locator->{status}->{availability} = $storage->testAvailability();
171      if ( !$storage->testAvailability() ) {      if ( !$storage->testAvailability() ) {
172        $logger->error( "$log_prefix is not available" );        $logger->error( "$log_prefix: testAvailability failed" );
       return;  
173      }      }
174    }    }
175                        
176    # should we test integrity of the storage before using it?    # should we test integrity of the storage before using it?
177    if ($locator->{test_integrity}) {    if ($locator->{status}->{availability} && $locator->{test_integrity}) {
178      #return unless $storage->testIntegrity();      #return unless $storage->testIntegrity();
179      $locator->{status}->{integrity} = $storage->testIntegrity();      $locator->{status}->{integrity} = $storage->testIntegrity();
180      # actions if integrity fails      # actions if integrity fails
181      if (!$locator->{status}->{integrity}) {      if (!$locator->{status}->{integrity}) {
182        $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();  
       }  
183      }      }
184    }    }
185    
# Line 159  sub initStorage { Line 188  sub initStorage {
188    # don't connect right here, do an implicit connect on (later) usage    # don't connect right here, do an implicit connect on (later) usage
189    # maybe set ->{meta}->{connectmethod} = "connect" here    # maybe set ->{meta}->{connectmethod} = "connect" here
190    #return unless $storage->connect();    #return unless $storage->connect();
191    $storage->connect();    $storage->connect() if $locator->{status}->{integrity};
192    
193    # should we check emptyness?    # should we check emptyness?
194    if ( $locator->{test_emptyness} && $locator->{status}->{integrity} ) {    if ($locator->{status}->{availability} && $locator->{test_emptyness}) {
195        #print "test empty", "\n";
196      if ( !@{$storage->getChildNodes()} ) {      if ( !@{$storage->getChildNodes()} ) {
197        $locator->{status}->{empty} = 1;        $locator->{status}->{empty} = 1;
198        $logger->warning( "$log_prefix is empty");        $logger->warning( "$log_prefix: Storage is empty.");
199        #return;        #return;
200      }      }
201    }    }
202    
203    # expand logging?    # expand logging?
204    if ( $locator->{logger} && $locator->{status}->{integrity} ) {    if ( $locator->{status}->{integrity} && $locator->{logger} ) {
205      # expand logging (to Tangram-Database)      # expand logging (to Tangram-Database)
206      # TODO:      # TODO:
207      # - 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 218  sub initStorage {
218    }    }
219    
220    #$self->{storage}->{$name} = $storage;    #$self->{storage}->{$name} = $storage;
221      #print "add storage: $name", "\n";
222    $self->addStorage($name, $storage);    $self->addStorage($name, $storage);
223    
224    return 1;    return 1;
# Line 197  sub initStorage { Line 228  sub initStorage {
228  sub initStorages {  sub initStorages {
229    my $self = shift;    my $self = shift;
230    foreach (keys %{$self->{locator}}) {    foreach (keys %{$self->{locator}}) {
231        #print $_, "\n";
232      $self->initStorage($_);      $self->initStorage($_);
233    }    }
234  }  }
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.7
MailToCvsAdmin">MailToCvsAdmin
 ViewVC Help
Powered by ViewVC 1.1.26 RSS 2.0 feed