Forks/privacore-open-source-search-engine
1
0
Fork 0
forked from Mirrors/privacore-open-source-search-engine
Code Pull Requests Activity

gb -h updates.

Browse Source 
Merge branch 'master' into testing

Conflicts:
	qa.cpp
This commit is contained in:
mwells
2014-07-30 06:46:38 -07:00
parent dc74386f87 3f584ecdaa
commit 515110c087
4 changed files with 26 additions and 20 deletions

6
Makefile

@ -553,10 +553,10 @@ master-rpm:
# need to do 'apt-get intall dh-make'
# deb-master
master-deb:
git archive --format=tar --prefix=gb-1.0/ master > ../gb_1.0.orig.tar
git archive --format=tar --prefix=gb-1.6/ master > ../gb_1.6.orig.tar
rm -rf debian
# change "-p gb_1.0" to "-p gb_1.1" to update version for example
dh_make -e gigablast@mail.com -p gb_1.0 -f ../gb_1.0.orig.tar
dh_make -e gigablast@mail.com -p gb_1.6 -f ../gb_1.6.orig.tar
# zero this out, it is just filed with the .txt files erroneously and it'll
# try to automatiicaly install in /usr/docs/
rm debian/docs
@ -581,7 +581,7 @@ master-deb:
# upload den
scp gb*.deb gk268:/w/html/
# alien it
sudo alien --to-rpm gb_1.0-1_i386.deb
sudo alien --to-rpm gb_1.6-1_i386.deb
# upload rpm
scp gb*.rpm gk268:/w/html/

4
changelog

@ -1,5 +1,5 @@
gb (1.5-1) unstable; urgency=low
gb (1.6-1) unstable; urgency=low
* Lots of bug fixes
-- mwells <gigablast@mail.com> Wed, 20 Jul 2014 17:38:35 -0700
-- mwells <gigablast@mail.com> Tue, 29 Jul 2014 17:38:35 -0700

23
main.cpp

@ -421,8 +421,7 @@ int main2 ( int argc , char *argv[] ) {
"\n"
"\tgb will first try to load "
"the hosts.conf in the same directory as the "
"gb binary, if not found, then it will try "
"/etc/gigablast/hosts.conf. "
"gb binary. "
"Then it will determine its hostId based on "
"the directory and IP address listed in the "
"hosts.conf file it loaded. Things in []'s "
@ -459,13 +458,13 @@ int main2 ( int argc , char *argv[] ) {
// "<hostId> -r\n\tindicates recovery mode, "
// "sends email to addresses "
// "specified in Conf.h upon startup.\n\n"
"-r\tindicates recovery mode, "
"sends email to addresses "
"specified in Conf.h upon startup.\n\n"
// "-r\tindicates recovery mode, "
// "sends email to addresses "
// "specified in Conf.h upon startup.\n\n"
"start [hostId]\n"
"\tstart the gb process on all hosts or just on "
"[hostId] if specified using an ssh command.\n\n"
"[hostId], if specified, using an ssh command.\n\n"
/*
"kstart [hostId]\n"
@ -477,11 +476,11 @@ int main2 ( int argc , char *argv[] ) {
"stop [hostId]\n"
"\tsaves and exits for all gb hosts or "
"just on [hostId] if specified.\n\n"
"just on [hostId], if specified.\n\n"
"save [hostId]\n"
"\tjust saves for all gb hosts or "
"just on [hostId] if specified.\n\n"
"just on [hostId], if specified.\n\n"
"start [hostId1-hostId2]\n"
"\ttwo hostids with a hyphen in between indicates a "
@ -512,11 +511,11 @@ int main2 ( int argc , char *argv[] ) {
"spidersoff [hostId]\n"
"\tdisables spidering for all gb hosts or "
"just on [hostId] if specified.\n\n"
"just on [hostId], if specified.\n\n"
"spiderson [hostId]\n"
"\tensables spidering for all gb hosts or "
"just on [hostId] if specified.\n\n"
"just on [hostId], if specified.\n\n"
/*
"cacheoff [hostId]\n"
@ -568,8 +567,8 @@ int main2 ( int argc , char *argv[] ) {
"install [hostId]\n"
"\tinstall all required files for gb from "
"current working directory "
"to [hostId]. If no [hostId] is specified install "
"current working directory of the gb binary "
"to [hostId]. If no [hostId] is specified, install "
"to ALL hosts.\n\n"
/*

13
qa.cpp

@ -204,8 +204,17 @@ void processReply ( char *reply , long replyLen ) {
s_ht.set(4,4,1024,NULL,0,false,0,"qaht");
// make symlink
//char cmd[512];
//snprintf(cmd,"cd %s/html ; ln -s ../qa ./qa", g_hostdb.m_dir);
//snprintf(cmd,"cd %s/html ;ln -s ../qa ./qa", g_hostdb.m_dir);
//system(cmd);
char dir[1024];
snprintf(dir,1000,"%sqa",g_hostdb.m_dir);
long status = ::mkdir ( dir ,
S_IRUSR | S_IWUSR | S_IXUSR |
S_IRGRP | S_IWGRP | S_IXGRP |
S_IROTH | S_IXOTH );
if ( status == -1 && errno != EEXIST && errno )
log("qa: Failed to make directory %s: %s.",
dir,mstrerror(errno));
// try to load from disk
SafeBuf fn;
fn.safePrintf("%s/qa/",g_hostdb.m_dir);
@ -1282,11 +1291,9 @@ static QATest s_qatests[] = {
"spiderHopCountTest",
"Test spidering ibm.com using hopcount limit."},
{qascrape,
"queryScrapeTest",
"Scrape and inject results from google and bing."}
};