Skip to content

Commit

Permalink
add prefix to logs
Browse files Browse the repository at this point in the history
  • Loading branch information
matias alejo garcia committed Jan 10, 2013
1 parent ba336a6 commit 0fe1f61
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 9 deletions.
14 changes: 7 additions & 7 deletions Makefile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ DIRFILESEP = /
DFSEP = $(DIRFILESEP) DFSEP = $(DIRFILESEP)
NAME = SQL::Bibliosoph NAME = SQL::Bibliosoph
NAME_SYM = SQL_Bibliosoph NAME_SYM = SQL_Bibliosoph
VERSION = 2.51 VERSION = 2.52
VERSION_MACRO = VERSION VERSION_MACRO = VERSION
VERSION_SYM = 2_51 VERSION_SYM = 2_52
DEFINE_VERSION = -D$(VERSION_MACRO)=\"$(VERSION)\" DEFINE_VERSION = -D$(VERSION_MACRO)=\"$(VERSION)\"
XS_VERSION = 2.51 XS_VERSION = 2.52
XS_VERSION_MACRO = XS_VERSION XS_VERSION_MACRO = XS_VERSION
XS_DEFINE_VERSION = -D$(XS_VERSION_MACRO)=\"$(XS_VERSION)\" XS_DEFINE_VERSION = -D$(XS_VERSION_MACRO)=\"$(XS_VERSION)\"
INST_ARCHLIB = blib/arch INST_ARCHLIB = blib/arch
Expand Down Expand Up @@ -273,7 +273,7 @@ RCS_LABEL = rcs -Nv$(VERSION_SYM): -q
DIST_CP = best DIST_CP = best
DIST_DEFAULT = tardist DIST_DEFAULT = tardist
DISTNAME = SQL-Bibliosoph DISTNAME = SQL-Bibliosoph
DISTVNAME = SQL-Bibliosoph-2.51 DISTVNAME = SQL-Bibliosoph-2.52




# --- MakeMaker macro section: # --- MakeMaker macro section:
Expand Down Expand Up @@ -534,7 +534,7 @@ metafile : create_distdir
$(NOECHO) $(ECHO) ' Tie::Hash::Random: 1' >> META_new.yml $(NOECHO) $(ECHO) ' Tie::Hash::Random: 1' >> META_new.yml
$(NOECHO) $(ECHO) ' Time::HiRes: 1.97' >> META_new.yml $(NOECHO) $(ECHO) ' Time::HiRes: 1.97' >> META_new.yml
$(NOECHO) $(ECHO) ' perl: 5.010000' >> META_new.yml $(NOECHO) $(ECHO) ' perl: 5.010000' >> META_new.yml
$(NOECHO) $(ECHO) 'version: 2.51' >> META_new.yml $(NOECHO) $(ECHO) 'version: 2.52' >> META_new.yml
-$(NOECHO) $(MV) META_new.yml $(DISTVNAME)/META.yml -$(NOECHO) $(MV) META_new.yml $(DISTVNAME)/META.yml
$(NOECHO) $(ECHO) Generating META.json $(NOECHO) $(ECHO) Generating META.json
$(NOECHO) $(ECHO) '{' > META_new.json $(NOECHO) $(ECHO) '{' > META_new.json
Expand Down Expand Up @@ -590,7 +590,7 @@ metafile : create_distdir
$(NOECHO) $(ECHO) ' }' >> META_new.json $(NOECHO) $(ECHO) ' }' >> META_new.json
$(NOECHO) $(ECHO) ' },' >> META_new.json $(NOECHO) $(ECHO) ' },' >> META_new.json
$(NOECHO) $(ECHO) ' "release_status" : "stable",' >> META_new.json $(NOECHO) $(ECHO) ' "release_status" : "stable",' >> META_new.json
$(NOECHO) $(ECHO) ' "version" : "2.51"' >> META_new.json $(NOECHO) $(ECHO) ' "version" : "2.52"' >> META_new.json
$(NOECHO) $(ECHO) '}' >> META_new.json $(NOECHO) $(ECHO) '}' >> META_new.json
-$(NOECHO) $(MV) META_new.json $(DISTVNAME)/META.json -$(NOECHO) $(MV) META_new.json $(DISTVNAME)/META.json


Expand Down Expand Up @@ -886,7 +886,7 @@ testdb_static :: testdb_dynamic
# --- MakeMaker ppd section: # --- MakeMaker ppd section:
# Creates a PPD (Perl Package Description) for a binary distribution. # Creates a PPD (Perl Package Description) for a binary distribution.
ppd : ppd :
$(NOECHO) $(ECHO) '<SOFTPKG NAME="$(DISTNAME)" VERSION="2.51">' > $(DISTNAME).ppd $(NOECHO) $(ECHO) '<SOFTPKG NAME="$(DISTNAME)" VERSION="2.52">' > $(DISTNAME).ppd
$(NOECHO) $(ECHO) ' <ABSTRACT>A SQL Query library</ABSTRACT>' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' <ABSTRACT>A SQL Query library</ABSTRACT>' >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) ' <AUTHOR>Matias Alejo Garcia ( matiu@cpan.org ) </AUTHOR>' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' <AUTHOR>Matias Alejo Garcia ( matiu@cpan.org ) </AUTHOR>' >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) ' <IMPLEMENTATION>' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' <IMPLEMENTATION>' >> $(DISTNAME).ppd
Expand Down
10 changes: 8 additions & 2 deletions lib/SQL/Bibliosoph.pm
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package SQL::Bibliosoph; {
use SQL::Bibliosoph::Query; use SQL::Bibliosoph::Query;
use SQL::Bibliosoph::CatalogFile; use SQL::Bibliosoph::CatalogFile;


our $VERSION = "2.51"; our $VERSION = "2.52";




has 'dbh' => ( is => 'ro', isa => 'DBI::db', required=> 1); has 'dbh' => ( is => 'ro', isa => 'DBI::db', required=> 1);
Expand All @@ -25,6 +25,7 @@ package SQL::Bibliosoph; {


has 'queries' => ( is => 'rw', default=> sub { return {}; } ); has 'queries' => ( is => 'rw', default=> sub { return {}; } );
has 'memc' => ( is => 'rw'); has 'memc' => ( is => 'rw');
has 'log_prefix'=> ( is => 'rw');
has throw_errors=> ( is => 'rw', default=> 1); has throw_errors=> ( is => 'rw', default=> 1);


## OLD (just for backwards compat) ## OLD (just for backwards compat)
Expand All @@ -33,14 +34,19 @@ package SQL::Bibliosoph; {
sub d { sub d {
my $self = shift; my $self = shift;
my $name = shift; my $name = shift;
print STDERR $name.join (':', map { $_ // 'NULL' } @_ ) if $self->debug(); print STDERR
$self->log_prefix()
. $name
. join (':', map { $_ // 'NULL' } @_ ) if $self->debug();
} }


#------------------------------------------------------------------ #------------------------------------------------------------------


sub BUILD { sub BUILD {
my ($self) = @_; my ($self) = @_;


$self->log_prefix('') if ! $self->log_prefix();

$self->d( "Constructing Bibliosoph\n" ) ; $self->d( "Constructing Bibliosoph\n" ) ;


$self->path( $self->path() . '/' ) if $self->path() ; $self->path( $self->path() . '/' ) if $self->path() ;
Expand Down

0 comments on commit 0fe1f61

Please sign in to comment.