|
 |
ba46c7 |
From 49245a17ee2e3c3f97ec2d7cd3bc45a744ed2ac8 Mon Sep 17 00:00:00 2001
|
|
|
ba46c7 |
From: Mark Reynolds <mreynolds@redhat.com>
|
|
|
ba46c7 |
Date: Wed, 14 Aug 2013 15:32:36 -0400
|
|
|
ba46c7 |
Subject: [PATCH 11/28] Ticket 47461 - logconv.pl - Use of comma-less variable list is deprecated
|
|
|
ba46c7 |
|
|
|
ba46c7 |
Description: In newer versions of perl commas are needed to separate variables
|
|
|
ba46c7 |
when "formatting" output. Also fixed a typo.
|
|
|
ba46c7 |
|
|
|
ba46c7 |
https://fedorahosted.org/389/ticket/47461
|
|
|
ba46c7 |
|
|
|
ba46c7 |
Reviewed by: nhosoi(Thanks!)
|
|
|
ba46c7 |
(cherry picked from commit 7e9cae5fa2292168e88e87eee2f9249171a1e9d8)
|
|
|
ba46c7 |
(cherry picked from commit 3e7ee7ca886feb56b3b26df97882c40d81bfff55)
|
|
|
ba46c7 |
---
|
|
|
ba46c7 |
ldap/admin/src/logconv.pl | 30 +++++++++++++++---------------
|
|
|
ba46c7 |
1 files changed, 15 insertions(+), 15 deletions(-)
|
|
|
ba46c7 |
|
|
|
ba46c7 |
diff --git a/ldap/admin/src/logconv.pl b/ldap/admin/src/logconv.pl
|
|
|
ba46c7 |
index efc5970..77088ff 100755
|
|
|
ba46c7 |
--- a/ldap/admin/src/logconv.pl
|
|
|
ba46c7 |
+++ b/ldap/admin/src/logconv.pl
|
|
|
ba46c7 |
@@ -594,7 +594,7 @@ print "Restarts: $serverRestartCount\n";
|
|
|
ba46c7 |
print "Total Connections: $connectionCount\n";
|
|
|
ba46c7 |
print " - StartTLS Connections: $startTLSCount\n";
|
|
|
ba46c7 |
print " - LDAPS Connections: $sslCount\n";
|
|
|
ba46c7 |
-print " - LDAPI Conections: $ldapiCount\n";
|
|
|
ba46c7 |
+print " - LDAPI Connections: $ldapiCount\n";
|
|
|
ba46c7 |
print "Peak Concurrent Connections: $maxsimConnection\n";
|
|
|
ba46c7 |
print "Total Operations: $allOps\n";
|
|
|
ba46c7 |
print "Total Results: $allResults\n";
|
|
|
ba46c7 |
@@ -614,20 +614,20 @@ $compareStat = sprintf "(%.2f/sec) (%.2f/min)\n",$cmpCount/$totalTimeInSecs, $c
|
|
|
ba46c7 |
$bindCountStat = sprintf "(%.2f/sec) (%.2f/min)\n",$bindCount/$totalTimeInSecs, $bindCount/($totalTimeInSecs/60);
|
|
|
ba46c7 |
|
|
|
ba46c7 |
format STDOUT =
|
|
|
ba46c7 |
-Searches: @<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<
|
|
|
ba46c7 |
- $srchCount, $searchStat
|
|
|
ba46c7 |
-Modifications: @<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<
|
|
|
ba46c7 |
- $modCount, $modStat
|
|
|
ba46c7 |
-Adds: @<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<
|
|
|
ba46c7 |
- $addCount, $addStat
|
|
|
ba46c7 |
-Deletes: @<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<
|
|
|
ba46c7 |
- $delCount, $deleteStat
|
|
|
ba46c7 |
-Mod RDNs: @<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<
|
|
|
ba46c7 |
- $modrdnCount, $modrdnStat
|
|
|
ba46c7 |
-Compares: @<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<
|
|
|
ba46c7 |
- $cmpCount, $compareStat
|
|
|
ba46c7 |
-Binds: @<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<
|
|
|
ba46c7 |
- $bindCount $bindCountStat
|
|
|
ba46c7 |
+Searches: @<<<<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
|
|
|
ba46c7 |
+ $srchCount, $searchStat,
|
|
|
ba46c7 |
+Modifications: @<<<<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
|
|
|
ba46c7 |
+ $modCount, $modStat,
|
|
|
ba46c7 |
+Adds: @<<<<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
|
|
|
ba46c7 |
+ $addCount, $addStat,
|
|
|
ba46c7 |
+Deletes: @<<<<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
|
|
|
ba46c7 |
+ $delCount, $deleteStat,
|
|
|
ba46c7 |
+Mod RDNs: @<<<<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
|
|
|
ba46c7 |
+ $modrdnCount, $modrdnStat,
|
|
|
ba46c7 |
+Compares: @<<<<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
|
|
|
ba46c7 |
+ $cmpCount, $compareStat,
|
|
|
ba46c7 |
+Binds: @<<<<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
|
|
|
ba46c7 |
+ $bindCount, $bindCountStat,
|
|
|
ba46c7 |
.
|
|
|
ba46c7 |
write STDOUT;
|
|
|
ba46c7 |
|
|
|
ba46c7 |
--
|
|
|
ba46c7 |
1.7.1
|
|
|
ba46c7 |
|