From d17039f09b3c3fc415d5778d954c02d6be5479dc Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 29 Mar 2019 14:26:53 +0100
Subject: [PATCH] Module: Rose::DBx::Cache::Anywhere durch eigene Variante
 ersetzt

---
 SL/DB.pm                                    |   4 +-
 SL/DB/Cache.pm                              |  44 ++++++++
 modules/override/Rose/DBx/Cache/Anywhere.pm | 116 --------------------
 3 files changed, 46 insertions(+), 118 deletions(-)
 create mode 100644 SL/DB/Cache.pm
 delete mode 100644 modules/override/Rose/DBx/Cache/Anywhere.pm

diff --git a/SL/DB.pm b/SL/DB.pm
index 79a251a09..d098302ad 100644
--- a/SL/DB.pm
+++ b/SL/DB.pm
@@ -6,12 +6,12 @@ use Carp;
 use Data::Dumper;
 use English qw(-no_match_vars);
 use Rose::DB;
-use Rose::DBx::Cache::Anywhere;
+use SL::DB::Cache;
 use Scalar::Util qw(blessed);
 
 use base qw(Rose::DB);
 
-__PACKAGE__->db_cache_class('Rose::DBx::Cache::Anywhere');
+__PACKAGE__->db_cache_class('SL::DB::Cache');
 __PACKAGE__->use_private_registry;
 
 my (%_db_registered);
diff --git a/SL/DB/Cache.pm b/SL/DB/Cache.pm
new file mode 100644
index 000000000..a0e8d7845
--- /dev/null
+++ b/SL/DB/Cache.pm
@@ -0,0 +1,44 @@
+package SL::DB::Cache;
+
+use strict;
+use warnings;
+
+use Carp;
+
+use parent qw(Rose::DB::Cache);
+
+sub prepare_db {
+  my ($self, $db, $entry) = @_;
+
+  if (!$entry->is_prepared) {
+    # if this a dummy kivitendo dbh, don't try to actually prepare this.
+    if ($db->type =~ /KIVITENDO_EMPTY/) {
+      return;
+    }
+
+    $entry->prepared(1);
+  }
+
+  if (!$db->dbh->ping) {
+    $db->dbh(undef);
+  }
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+SL::DB::Cache - database handle caching for kivitendo
+
+=head1 DESCRIPTION
+
+This class provides database cache handling for kivitendo running
+under FastCGI. It's based on Rose::DBx::Cache::Anywhere.
+
+=head1 METHODS
+
+=head2 prepare_db( I<rose_db>, I<entry> )
+
+Overrides default method to always ping() dbh.
diff --git a/modules/override/Rose/DBx/Cache/Anywhere.pm b/modules/override/Rose/DBx/Cache/Anywhere.pm
deleted file mode 100644
index abc87c759..000000000
--- a/modules/override/Rose/DBx/Cache/Anywhere.pm
+++ /dev/null
@@ -1,116 +0,0 @@
-package Rose::DBx::Cache::Anywhere;
-use strict;
-use warnings;
-use Carp;
-use base qw( Rose::DB::Cache );
-
-=head1 NAME
-
-Rose::DBx::Cache::Anywhere - get Apache::DBI behaviour without Apache
-
-=head1 DESCRIPTION
-
-This class is used by Rose::DBx::AutoReconnect.
-The author uses
-Rose::DB with Catalyst under both the Catalyst dev server and
-FastCGI and found that the standard Rose::DB::Cache behaviour
-did not work well with those environments.
-
-=head1 METHODS
-
-=head2 prepare_db( I<rose_db>, I<entry> )
-
-Overrides default method to always ping() dbh if not running
-under mod_perl.
-
-=cut
-
-sub prepare_db {
-    my ( $self, $db, $entry ) = @_;
-
-    if ( Rose::DB::Cache::MOD_PERL_1 || Rose::DB::Cache::MOD_PERL_2 ) {
-        return $self->SUPER::prepare_db( $db, $entry );
-    }
-
-    if ( !$entry->is_prepared ) {
-        if ( $entry->created_during_apache_startup ) {
-            if ( $db->has_dbh ) {
-                eval { $db->dbh->disconnect };    # will probably fail!
-                $db->dbh(undef);
-            }
-
-            $entry->created_during_apache_startup(0);
-            return;
-        }
-
-        # if this a dummy kivitendo dbh, don't try to actually prepare this.
-        if ($db->type =~ /KIVITENDO_EMPTY/) {
-          return;
-        }
-
-        $entry->prepared(1);
-    }
-
-    if ( !$db->dbh->ping ) {
-        $db->dbh(undef);
-    }
-}
-
-1;
-
-__END__
-
-=head1 AUTHOR
-
-Peter Karman, C<< <karman at cpan.org> >>
-
-=head1 BUGS
-
-Please report any bugs or feature requests to
-C<bug-rose-dbx-autoreconnect at rt.cpan.org>, or through the web interface at
-L<http://rt.cpan.org/NoAuth/ReportBug.html?Queue=Rose-DBx-AutoReconnect>.
-I will be notified, and then you'll automatically be notified of progress on
-your bug as I make changes.
-
-=head1 SUPPORT
-
-You can find documentation for this module with the perldoc command.
-
-    perldoc Rose::DBx::AutoReconnect
-
-You can also look for information at:
-
-=over 4
-
-=item * AnnoCPAN: Annotated CPAN documentation
-
-L<http://annocpan.org/dist/Rose-DBx-AutoReconnect>
-
-=item * CPAN Ratings
-
-L<http://cpanratings.perl.org/d/Rose-DBx-AutoReconnect>
-
-=item * RT: CPAN's request tracker
-
-L<http://rt.cpan.org/NoAuth/Bugs.html?Dist=Rose-DBx-AutoReconnect>
-
-=item * Search CPAN
-
-L<http://search.cpan.org/dist/Rose-DBx-AutoReconnect>
-
-=back
-
-=head1 ACKNOWLEDGEMENTS
-
-The Minnesota Supercomputing Institute C<< http://www.msi.umn.edu/ >>
-sponsored the development of this software.
-
-=head1 COPYRIGHT
-
-Copyright 2008 by the Regents of the University of Minnesota.
-All rights reserved.
-
-This program is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself.
-
-=cut
-- 
2.20.1