evan/rats-search
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge a2409575fba9c3ffb4b104fc6915bc82ef686ead into af821b57bb30f2a1644b365c365f79cc0b798477

Browse Source
This commit is contained in:
vGimly 2018-08-08 14:51:36 +00:00 committed by GitHub
commit 1e24bd67ef
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/background/sphinx.js
View File

@ -156,7 +156,11 @@ module.exports = (callback, dataDirectory, onClose) => {
appConfig['dbPath'] = sphinxConfigDirectory
}
const { isInitDb } = writeSphinxConfig(sphinxConfigDirectory, appConfig.dbPath)
const sphinxPid=`${sphinxConfigDirectory}/searchd.pid`
const isSphinxExternal=fs.existsSync(sphinxPid)
logT('sphinx', "Pid: "+sphinxPid + (isSphinxExternal?" exists.":" no file."));
const { isInitDb } = isSphinxExternal ? {isInitDb: false} : writeSphinxConfig(sphinxConfigDirectory, appConfig.dbPath)
const config = `${sphinxConfigDirectory}/sphinx.conf`
const options = ['--config', config]
@ -164,7 +168,10 @@ module.exports = (callback, dataDirectory, onClose) => {
{
options.push('--nodetach')
}
const sphinx = spawn(sphinxPath, options)
const sphinx = !isSphinxExternal ? spawn(sphinxPath, options) :
{isExternal: true, on: (d,f) => {}, stdout: {on : (d,f)=>{} }};
// remeber initizalizing of db
sphinx.start = start
sphinx.isInitDb = isInitDb
@ -173,6 +180,8 @@ module.exports = (callback, dataDirectory, onClose) => {
const optimizeResolvers = {}
if (isSphinxExternal && callback) setTimeout(()=>{logT('sphinx', 'external sphinx signalled');callback()},500);
sphinx.stdout.on('data', (data) => {
logT('sphinx', `sphinx: ${data}`)
@ -216,7 +225,8 @@ module.exports = (callback, dataDirectory, onClose) => {
sphinx.onClose = onFinish
if(replaceFinish)
sphinx.replaceOnClose = true // sometime we don't want to call default callback
exec(`"${sphinxPath}" --config "${config}" --stopwait`)
if (!sphinx.isExternal)
exec(`"${sphinxPath}" --config "${config}" --stopwait`)
}
sphinx.waitOptimized = (table) => new Promise((resolve) => {
@ -227,6 +237,9 @@ module.exports = (callback, dataDirectory, onClose) => {
})
sphinx.fixDatabase = async () => {
if(sphinx.isExternal)
return
if(sphinx.fixing)
return
sphinx.fixing = true