INN commit: trunk/nnrpd (article.c)

INN Commit rra at isc.org
Sat Mar 21 14:47:15 UTC 2015


    Date: Saturday, March 21, 2015 @ 07:47:15
  Author: iulius
Revision: 9802

nnrpd:  Count write time stats when using SASL

Modified:
  trunk/nnrpd/article.c

-----------+
 article.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: article.c
===================================================================
--- article.c	2015-03-21 13:37:54 UTC (rev 9801)
+++ article.c	2015-03-21 14:47:15 UTC (rev 9802)
@@ -62,6 +62,8 @@
 {
     int result = 0;
 
+    TMRstart(TMR_NNTPWRITE);
+
 #ifdef HAVE_SASL
     if (sasl_conn && sasl_ssf) {
 	int i;
@@ -72,8 +74,6 @@
     } else {
 #endif /* HAVE_SASL */
 
-        TMRstart(TMR_NNTPWRITE);
-
 #ifdef HAVE_OPENSSL
 	if (tls_conn) {
 Again:
@@ -97,12 +97,12 @@
 #endif /* HAVE_OPENSSL */
 	    result = xwritev(STDOUT_FILENO, vec, *countp);
 
-        TMRstop(TMR_NNTPWRITE);
-
 #ifdef HAVE_SASL
     }
 #endif
 
+    TMRstop(TMR_NNTPWRITE);
+
     if (result == -1) {
 	/* We can't recover, since we can't resynchronise with our
 	 * peer. */
@@ -241,7 +241,8 @@
     if (PERMaccessconf->nnrpdoverstats) {
 	gettimeofday(&stv, NULL);
     }
-    art = SMretrieve(token, RETR_STAT); /* XXX This isn't really overstats, is it? */
+    art = SMretrieve(token, RETR_STAT);
+    /* XXX This isn't really overstats, is it? */
     if (PERMaccessconf->nnrpdoverstats) {
 	gettimeofday(&etv, NULL);
 	OVERartcheck+=(etv.tv_sec - stv.tv_sec) * 1000;



More information about the inn-committers mailing list