Kelson has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/343898 )
Change subject: Few clean and better verbose message.
......................................................................
Few clean and better verbose message.
Change-Id: Id4675f70422ecef42198ca33fe82bc1f33866548
---
M zimwriterfs/indexer.cpp
M zimwriterfs/indexer.h
2 files changed, 4 insertions(+), 8 deletions(-)
Approvals:
Kelson: Verified; Looks good to me, approved
diff --git a/zimwriterfs/indexer.cpp b/zimwriterfs/indexer.cpp
index b83abd4..33989f4 100644
--- a/zimwriterfs/indexer.cpp
+++ b/zimwriterfs/indexer.cpp
@@ -89,6 +89,10 @@
indexedArticleCount += 1;
+ if ( (indexedArticleCount % 1000 == 0) && self->getVerboseFlag()) {
+ std::cout << indexedArticleCount << " articled indexed." <<std::endl;
+ }
+
/* Make a hard-disk flush every 10.000 articles */
if (indexedArticleCount % 5000 == 0) {
self->flush();
@@ -137,10 +141,6 @@
bool Indexer::popFromToIndexQueue(indexerToken &token) {
while (this->isToIndexQueueEmpty()) {
usleep(500);
- if (this->getVerboseFlag()) {
- std::cout << "Waiting... ToIndexQueue is empty for now..." << std::endl;
- }
-
pthread_testcancel();
}
diff --git a/zimwriterfs/indexer.h b/zimwriterfs/indexer.h
index 3291e36..686d156 100644
--- a/zimwriterfs/indexer.h
+++ b/zimwriterfs/indexer.h
@@ -29,14 +29,10 @@
#include <sstream>
#include <pthread.h>
-/*#include <stringTools.h>
-#include <otherTools.h>
-#include <resourceTools.h>*/
#include <zim/file.h>
#include <zim/article.h>
#include <zim/fileiterator.h>
#include <zim/writer/zimcreator.h>
-/*#include "reader.h"*/
using namespace std;
--
To view, visit https://gerrit.wikimedia.org/r/343898
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4675f70422ecef42198ca33fe82bc1f33866548
Gerrit-PatchSet: 1
Gerrit-Project: openzim
Gerrit-Branch: master
Gerrit-Owner: Mgautierfr <mgaut...@kymeria.fr>
Gerrit-Reviewer: Kelson <kel...@kiwix.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
