* [gentoo-commits] dev/fordfrog:master commit in: dev-db/pgfouine/files/, dev-db/pgfouine/
@ 2011-06-30 9:59 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2011-06-30 9:59 UTC (permalink / raw
To: gentoo-commits
commit: d56a5254e0c24409d27a5f6a811e57ea1ecd7f7a
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 09:58:55 2011 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 09:58:55 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=d56a5254
dev-db/pgfouine: fixed error with hints existing for non-error log lines
---
dev-db/pgfouine/ChangeLog | 6 +++++
dev-db/pgfouine/Manifest | 5 ++-
.../files/disable-hints-for-non-errors.patch | 22 ++++++++++++++++++++
...{pgfouine-1.2.ebuild => pgfouine-1.2-r1.ebuild} | 3 ++
4 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/dev-db/pgfouine/ChangeLog b/dev-db/pgfouine/ChangeLog
index cd1a773..fc353a0 100644
--- a/dev-db/pgfouine/ChangeLog
+++ b/dev-db/pgfouine/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*pgfouine-1.2-r1 (30 Jun 2011)
+
+ 30 Jun 2011; Miroslav Šulc <fordfrog@gentoo.org> -pgfouine-1.2.ebuild,
+ +pgfouine-1.2-r1.ebuild, +files/disable-hints-for-non-errors.patch:
+ Fixed error with hints existing for non-error log lines
+
30 Jun 2011; Miroslav Šulc <fordfrog@gentoo.org> pgfouine-1.2.ebuild:
Added dependencies on php modules
diff --git a/dev-db/pgfouine/Manifest b/dev-db/pgfouine/Manifest
index 551727a..0367766 100644
--- a/dev-db/pgfouine/Manifest
+++ b/dev-db/pgfouine/Manifest
@@ -1,4 +1,5 @@
+AUX disable-hints-for-non-errors.patch 744 RMD160 eb110c7870b4ee8c44841714ce0f57059a5725b6 SHA1 6bf0e4dc414fd9444382de1e3c9906b6ffaad856 SHA256 647ae25fee5d83fd43ac479d628c19c6140c25de8c47043e4e9a72a89cd4a1f6
DIST pgfouine-1.2.tar.gz 793004 RMD160 126c8ac1d65e32e093db9f9b510f3d6a5a663237 SHA1 aca54b34d93a6b1faa2c55b382b9f0742fce081d SHA256 6c5b753d7c14744cd23021d327016040cd86e14d29c055babf556ee2160a17fd
-EBUILD pgfouine-1.2.ebuild 1159 RMD160 08ac14fc9812e7fae69ffce1672fd56ed0e3a2b2 SHA1 7e54a25b33a3a273148a3bf44c5e7238d8b56373 SHA256 21801d0b6114f20b72fec1b79f3afb662ed704bd8480081ed85960761007e7d1
-MISC ChangeLog 439 RMD160 ecca13416bce8a7e2519843ec1c4ee3a527fbf1b SHA1 77315d8893b15fc71df935f6df241d76c7891206 SHA256 bf333e0804e531df6751bdb3db065dbeedf38bf13cd42909de46dc1c08f33c9d
+EBUILD pgfouine-1.2-r1.ebuild 1362 RMD160 80bee8d3dcca7434ff2f219b4a22d526fe407568 SHA1 273662a7bdfb4f9284b8bde41b86e0f963f7c00e SHA256 88c1de1e6cf040e08bf23fbd2039a66d1e1e2a7603060277f645aa0fb50b8146
+MISC ChangeLog 674 RMD160 0643f7408c73d138c7e45f70a6f0a7eb6b454501 SHA1 6ee1f7f87aa73f5c6e0182e0dc66916689dc893f SHA256 02cdfba2637f220acbe1ad85ec1e7b7a303c06f85f063fe0dc5d592792c9bbbe
MISC metadata.xml 257 RMD160 743513e54bce621fb29181c8f2c9bc9521f83c12 SHA1 6e6259d3bca13f00ad4e47d103c78a856fcdec7a SHA256 ca5a181e2b7199de87f8012a08f0d58b12de37e4a4cd8e4659e0dad86f774892
diff --git a/dev-db/pgfouine/files/disable-hints-for-non-errors.patch b/dev-db/pgfouine/files/disable-hints-for-non-errors.patch
new file mode 100644
index 0000000..fab176d
--- /dev/null
+++ b/dev-db/pgfouine/files/disable-hints-for-non-errors.patch
@@ -0,0 +1,22 @@
+diff --git a/pgfouine-1.2/include/postgresql/lines/PostgreSQLHintLine.class.php b/pgfouine-1.2/include/postgresql/lines/PostgreSQLHintLine.class.php
+index 274f238..f23debd 100644
+--- a/pgfouine-1.2/include/postgresql/lines/PostgreSQLHintLine.class.php
++++ b/pgfouine-1.2/include/postgresql/lines/PostgreSQLHintLine.class.php
+@@ -25,7 +25,9 @@ class PostgreSQLHintLine extends PostgreSQLLogLine {
+ var $ignore = false;
+
+ function appendTo(& $logObject) {
+- $logObject->appendHint($this->text);
++ if (method_exists($logObject, 'appendHint')) {
++ $logObject->appendHint($this->text);
++ }
+ }
+
+ function isContextual() {
+@@ -33,4 +35,4 @@ class PostgreSQLHintLine extends PostgreSQLLogLine {
+ }
+ }
+
+-?>
+\ No newline at end of file
++?>
diff --git a/dev-db/pgfouine/pgfouine-1.2.ebuild b/dev-db/pgfouine/pgfouine-1.2-r1.ebuild
similarity index 85%
rename from dev-db/pgfouine/pgfouine-1.2.ebuild
rename to dev-db/pgfouine/pgfouine-1.2-r1.ebuild
index 42fadc2..2ccb529 100644
--- a/dev-db/pgfouine/pgfouine-1.2.ebuild
+++ b/dev-db/pgfouine/pgfouine-1.2-r1.ebuild
@@ -22,6 +22,9 @@ RDEPEND=">=dev-lang/php-4[gd,truetype]"
src_prepare() {
find -name CVS -type d | xargs rm -fr
+ # some logs may contain hints even for non-error log lines
+ # this patch disables adding hints to log objects that do not have appendHint() method
+ epatch ${FILESDIR}/disable-hints-for-non-errors.patch
}
src_configure() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/fordfrog:master commit in: dev-db/pgfouine/files/, dev-db/pgfouine/
@ 2011-10-22 21:08 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2011-10-22 21:08 UTC (permalink / raw
To: gentoo-commits
commit: bfd0a86831c87ed7780609e494b1408eb0ea049c
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 22 21:07:48 2011 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Oct 22 21:07:48 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=bfd0a868
dev-db/pgfouine: added support for parsing cvslog format of PostgreSQL version 9.0 and above
---
dev-db/pgfouine/ChangeLog | 8 ++++++++
dev-db/pgfouine/files/support-9.0-csvlog.patch | 13 +++++++++++++
...fouine-1.2-r1.ebuild => pgfouine-1.2-r2.ebuild} | 4 ++++
3 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/dev-db/pgfouine/ChangeLog b/dev-db/pgfouine/ChangeLog
index fc353a0..a1f0288 100644
--- a/dev-db/pgfouine/ChangeLog
+++ b/dev-db/pgfouine/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*pgfouine-1.2-r2 (22 Oct 2011)
+
+ 22 Oct 2011; Miroslav Šulc <fordfrog@gentoo.org> -pgfouine-1.2-r1.ebuild,
+ +pgfouine-1.2-r2.ebuild, +files/support-9.0-csvlog.patch:
+ Added patch from Matt Saunders
+ (http://pgfoundry.org/forum/forum.php?thread_id=2948&forum_id=555) which
+ enables to parse cvslog log files from PostgreSQL version 9.0 and above
+
*pgfouine-1.2-r1 (30 Jun 2011)
30 Jun 2011; Miroslav Šulc <fordfrog@gentoo.org> -pgfouine-1.2.ebuild,
diff --git a/dev-db/pgfouine/files/support-9.0-csvlog.patch b/dev-db/pgfouine/files/support-9.0-csvlog.patch
new file mode 100644
index 0000000..70538ee
--- /dev/null
+++ b/dev-db/pgfouine/files/support-9.0-csvlog.patch
@@ -0,0 +1,13 @@
+diff --git a/include/CsvlogLogReader.class.php b/include/CsvlogLogReader.class.php
+index cbd18df..e4a5744 100644
+--- a/include/CsvlogLogReader.class.php
++++ b/include/CsvlogLogReader.class.php
+@@ -32,7 +32,7 @@ class CsvlogLogReader extends GenericLogReader {
+ while ($csvLine = fgetcsv($filePointer)) {
+ $lineParsedCounter ++;
+
+- if(count($csvLine) == 22) {
++ if(count($csvLine) == 22 || (count($csvLine) == 23) {
+ $lines =& $lineParser->parse($csvLine);
+
+ if($lines) {
diff --git a/dev-db/pgfouine/pgfouine-1.2-r1.ebuild b/dev-db/pgfouine/pgfouine-1.2-r2.ebuild
similarity index 83%
rename from dev-db/pgfouine/pgfouine-1.2-r1.ebuild
rename to dev-db/pgfouine/pgfouine-1.2-r2.ebuild
index 2ccb529..362c222 100644
--- a/dev-db/pgfouine/pgfouine-1.2-r1.ebuild
+++ b/dev-db/pgfouine/pgfouine-1.2-r2.ebuild
@@ -25,6 +25,10 @@ src_prepare() {
# some logs may contain hints even for non-error log lines
# this patch disables adding hints to log objects that do not have appendHint() method
epatch ${FILESDIR}/disable-hints-for-non-errors.patch
+ # PostgreSQL version 9.0 added extra field to csvlog but pgFouine ignores such lines
+ # as they have 23 columns and not 22
+ # Patch by Matt Saunders: http://pgfoundry.org/forum/forum.php?thread_id=2948&forum_id=555
+ epatch ${FILESDIR}/support-9.0-csvlog.patch
}
src_configure() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/fordfrog:master commit in: dev-db/pgfouine/files/, dev-db/pgfouine/
@ 2011-10-22 21:12 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2011-10-22 21:12 UTC (permalink / raw
To: gentoo-commits
commit: c6369b97d6b002f766a4298896b6a4c6c818f62f
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 22 21:11:55 2011 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Oct 22 21:11:55 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=c6369b97
dev-db/pgfouine: fixed typo in patch
---
dev-db/pgfouine/ChangeLog | 4 ++++
dev-db/pgfouine/Manifest | 4 ++--
dev-db/pgfouine/files/support-9.0-csvlog.patch | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/dev-db/pgfouine/ChangeLog b/dev-db/pgfouine/ChangeLog
index a1f0288..aea0c2a 100644
--- a/dev-db/pgfouine/ChangeLog
+++ b/dev-db/pgfouine/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 22 Oct 2011; Miroslav Šulc <fordfrog@gentoo.org>
+ files/support-9.0-csvlog.patch:
+ Fixed typo in the patch
+
*pgfouine-1.2-r2 (22 Oct 2011)
22 Oct 2011; Miroslav Šulc <fordfrog@gentoo.org> -pgfouine-1.2-r1.ebuild,
diff --git a/dev-db/pgfouine/Manifest b/dev-db/pgfouine/Manifest
index 9e440b6..91e9b2d 100644
--- a/dev-db/pgfouine/Manifest
+++ b/dev-db/pgfouine/Manifest
@@ -1,6 +1,6 @@
AUX disable-hints-for-non-errors.patch 744 RMD160 eb110c7870b4ee8c44841714ce0f57059a5725b6 SHA1 6bf0e4dc414fd9444382de1e3c9906b6ffaad856 SHA256 647ae25fee5d83fd43ac479d628c19c6140c25de8c47043e4e9a72a89cd4a1f6
-AUX support-9.0-csvlog.patch 497 RMD160 0e15740bb4088962ba1474a679fd90596685d1bf SHA1 e43ce3c2301ec300d4d6866f5b2d915088aed677 SHA256 0d4a4ef92d4d68c3b7569228328fd213d73b7fe020fe2d83daee305b3c1bf1de
+AUX support-9.0-csvlog.patch 496 RMD160 7c1bb384e0affdbb5ef9e1fe969e074a25e439c0 SHA1 32fbde4478f206e1f546a52efaf0e9870fb3d8f4 SHA256 e35e2e818b1fffd3755fc9e1e1beb0795373fb0cae52fd8da0f92eeafc62a1b3
DIST pgfouine-1.2.tar.gz 793004 RMD160 126c8ac1d65e32e093db9f9b510f3d6a5a663237 SHA1 aca54b34d93a6b1faa2c55b382b9f0742fce081d SHA256 6c5b753d7c14744cd23021d327016040cd86e14d29c055babf556ee2160a17fd
EBUILD pgfouine-1.2-r2.ebuild 1627 RMD160 673522a719e3f7dc992e1b53554e087e15d2c625 SHA1 b8f70f66203bb9c8527125cb6b1615d4884ca6d9 SHA256 df082532217dfcf1f2859c5adaecbe7bdec4bb37144da7d2a46fd55e2e301595
-MISC ChangeLog 1026 RMD160 26fb0eb70fe17bf75a09be33d209fed35183a793 SHA1 5660e4d1982d24fb26b81791b9993514454823be SHA256 c58f9787d81ebec1ca7d0a49f6fffac50c20662c9747397acc6a0099e41392b8
+MISC ChangeLog 1139 RMD160 362451a6ac84640d03615b5c8aeb1f04ba37ab55 SHA1 ce9aba1bceb40cebcb5d5272ae94927fd78380ae SHA256 8c7bfea823c6808af81d3957614a6aa7bace09749923d01ed82a23ae41c3c2dd
MISC metadata.xml 257 RMD160 743513e54bce621fb29181c8f2c9bc9521f83c12 SHA1 6e6259d3bca13f00ad4e47d103c78a856fcdec7a SHA256 ca5a181e2b7199de87f8012a08f0d58b12de37e4a4cd8e4659e0dad86f774892
diff --git a/dev-db/pgfouine/files/support-9.0-csvlog.patch b/dev-db/pgfouine/files/support-9.0-csvlog.patch
index 70538ee..86e76fa 100644
--- a/dev-db/pgfouine/files/support-9.0-csvlog.patch
+++ b/dev-db/pgfouine/files/support-9.0-csvlog.patch
@@ -7,7 +7,7 @@ index cbd18df..e4a5744 100644
$lineParsedCounter ++;
- if(count($csvLine) == 22) {
-+ if(count($csvLine) == 22 || (count($csvLine) == 23) {
++ if(count($csvLine) == 22 || count($csvLine) == 23) {
$lines =& $lineParser->parse($csvLine);
if($lines) {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-10-22 21:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-22 21:12 [gentoo-commits] dev/fordfrog:master commit in: dev-db/pgfouine/files/, dev-db/pgfouine/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2011-10-22 21:08 Miroslav Šulc
2011-06-30 9:59 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox