kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-22 11:22:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

kiwix-serve: Skip broken ZIM files and continue startup

Browse Source
This commit is contained in:
Florian Schüller 2024-01-20 13:46:27 +01:00 committed by Emmanuel Engelhart
parent 7913b6a4f0
commit 456c77d8fd
No known key found for this signature in database
GPG Key ID: 120B30D020B553D3
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/server/kiwix-serve.cpp
View File

@ -77,6 +77,7 @@ void usage()
<< "\t-z, --nodatealiases\tCreate URL aliases for each content by removing the date" << std::endl << "\t-z, --nodatealiases\tCreate URL aliases for each content by removing the date" << std::endl
<< "\t-c, --customIndex\tAdd path to custom index.html for welcome page" << std::endl << "\t-c, --customIndex\tAdd path to custom index.html for welcome page" << std::endl
<< "\t-L, --ipConnectionLimit\tMax number of (concurrent) connections per IP (default: infinite, recommended: >= 6)" << std::endl << "\t-L, --ipConnectionLimit\tMax number of (concurrent) connections per IP (default: infinite, recommended: >= 6)" << std::endl
<< "\t-k, --skipBroken\tStartup the server even when ZIM files are broken (those will be skipped)" << std::endl
<< std::endl << std::endl
<< "Documentation:" << std::endl << "Documentation:" << std::endl
@ -217,6 +218,7 @@ int main(int argc, char** argv)
unsigned int PPID = 0; unsigned int PPID = 0;
int ipConnectionLimit = 0; int ipConnectionLimit = 0;
int searchLimit = 0; int searchLimit = 0;
bool skipBroken = false;
static struct option long_options[] static struct option long_options[]
= {{"daemon", no_argument, 0, 'd'}, = {{"daemon", no_argument, 0, 'd'},
@ -237,6 +239,7 @@ int main(int argc, char** argv)
{"monitorLibrary", no_argument, 0, 'M'}, {"monitorLibrary", no_argument, 0, 'M'},
{"ipConnectionLimit", required_argument, 0, 'L'}, {"ipConnectionLimit", required_argument, 0, 'L'},
{"searchLimit", required_argument, 0, 's'}, {"searchLimit", required_argument, 0, 's'},
{"skipBroken", no_argument, 0, 'k'},
{0, 0, 0, 0}}; {0, 0, 0, 0}};
std::set<int> usedOptions; std::set<int> usedOptions;
@ -307,6 +310,9 @@ int main(int argc, char** argv)
case 's': case 's':
searchLimit = atoi(optarg); searchLimit = atoi(optarg);
break; break;
case 'k':
skipBroken = true;
break;
case '?': case '?':
usage(); usage();
return 2; return 2;
@ -348,9 +354,13 @@ int main(int argc, char** argv)
std::vector<std::string>::iterator it; std::vector<std::string>::iterator it;
for (it = zimPathes.begin(); it != zimPathes.end(); it++) { for (it = zimPathes.begin(); it != zimPathes.end(); it++) {
if (!manager.addBookFromPath(*it, *it, "", false)) { if (!manager.addBookFromPath(*it, *it, "", false)) {
std::cerr << "Unable to add the ZIM file '" << *it if ( skipBroken ) {
<< "' to the internal library." << std::endl; std::cerr << "Skipping broken '" << *it << "' ...continuing" << std::endl;
exit(1); } else {
std::cerr << "Unable to add the ZIM file '" << *it
<< "' to the internal library." << std::endl;
exit(1);
}
} }
} }
} }