Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix service state detection

This commit is contained in:
Wilfried Goesgens 2017-06-01 18:56:27 +02:00
parent 619eae9be5
commit aa3e8c1537
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Installation/Windows/Templates/NSIS.template.in
View File

@ -472,18 +472,18 @@ Section "-Core installation"
Delete "$newCfgValuesFile" Delete "$newCfgValuesFile"
${If} $UpgradeInstall == "1" ${If} $UpgradeInstall == "1"
Goto done ; database directory already present - skip. Goto doneSetPassword ; database directory already present - skip.
${EndIf} ${EndIf}
System::Call 'Kernel32::SetEnvironmentVariable(t, t)i ("ARANGODB_DEFAULT_ROOT_PASSWORD", "$PASSWORD").r0' System::Call 'Kernel32::SetEnvironmentVariable(t, t)i ("ARANGODB_DEFAULT_ROOT_PASSWORD", "$PASSWORD").r0'
StrCmp $0 0 error StrCmp $0 0 error
ExecWait "$INSTDIR\${SBIN_DIR}\arangod.exe --database.init-database --server.rest-server false --server.statistics false --foxx.queues false" $0 ExecWait "$INSTDIR\${SBIN_DIR}\arangod.exe --database.init-database --server.rest-server false --server.statistics false --foxx.queues false" $0
${If} $0 == 0 ${If} $0 == 0
Goto done Goto doneSetPassword
${EndIf} ${EndIf}
error: error:
MessageBox MB_OK "Failed to initialize database password." MessageBox MB_OK "Failed to initialize database password."
Abort Abort
done: doneSetPassword:
StrCmp $TRI_INSTALL_TYPE 'Service' 0 nothing StrCmp $TRI_INSTALL_TYPE 'Service' 0 nothing
DetailPrint "Installing service ${TRI_SVC_NAME}: " DetailPrint "Installing service ${TRI_SVC_NAME}: "
SimpleSC::InstallService '${TRI_SVC_NAME}' '' '16' '2' '"$INSTDIR\${SBIN_DIR}\arangod.exe" --start-service' '' '' '' SimpleSC::InstallService '${TRI_SVC_NAME}' '' '16' '2' '"$INSTDIR\${SBIN_DIR}\arangod.exe" --start-service' '' '' ''
@ -492,25 +492,28 @@ System::Call 'Kernel32::SetEnvironmentVariable(t, t)i ("ARANGODB_DEFAULT_ROOT_PA
SimpleSC::SetServiceDescription '${TRI_SVC_NAME}' '${TRI_FRIENDLY_SVC_NAME}' SimpleSC::SetServiceDescription '${TRI_SVC_NAME}' '${TRI_FRIENDLY_SVC_NAME}'
Pop $0 Pop $0
DetailPrint "Status: $0; Starting Service" DetailPrint "Status: $0; Starting Service"
SimpleSC::StartService '${TRI_SVC_NAME}' '' 40 SimpleSC::StartService '${TRI_SVC_NAME}' '' 45
Pop $0 Pop $0
DetailPrint "Status: $0" DetailPrint "Status: $0"
${If} $0 != "0" ${If} $0 != "0"
Call QueryServiceStatus Call QueryServiceStatus
Pop $0
Pop $1
Pop $2 Pop $2
Pop $1
Pop $0
!define SC_WAITED "Waited 40 seconds for the ArangoDB service to come up;" !define SC_WAITED "Waited 40 seconds for the ArangoDB service to come up;"
!define SC_SV "Please look at $\r$\n`sc query ${TRI_SVC_NAME}`" !define SC_SV "Please look at $\r$\n`sc query ${TRI_SVC_NAME}`"
!define SC_EVLOG "and the Windows Eventlog for eventual errors!" !define SC_EVLOG "and the Windows Eventlog for eventual errors!"
${If} $1 == "1066"
${If} $2 == "1"
${If} $2 == "1" MessageBox MB_OK "${SC_WAITED}$\r$\nbut it exited with an error; $\r$\n${SC_SV}$\r$\n${SC_EVLOG}"
MessageBox MB_OK "${SC_WAITED}$\r$\nbut it exited with an error; $\r$\n${SC_SV}$\r$\n${SC_EVLOG}" Abort
${ElseIf} $2 == "2" ${ElseIf} $2 == "2"
MessageBox MB_OK "${SC_WAITED}$\r$\nbut it exited with a fatal error; $\r$\n${SC_SV}$\r$\n${SC_EVLOG}" MessageBox MB_OK "${SC_WAITED}$\r$\nbut it exited with a fatal error; $\r$\n${SC_SV}$\r$\n${SC_EVLOG}"
${Else} Abort
MessageBox MB_OK "${SC_WAITED}$\r$\n${SC_SV}$\r$\n${SC_EVLOG}" ${EndIf}
${ElseIf} $1 != "0"
MessageBox MB_OK "${SC_WAITED}$\r$\n${SC_SV}$\r$\n${SC_EVLOG} $0 $1 $2"
Abort
${EndIf} ${EndIf}
Abort Abort
${EndIf} ${EndIf}
@ -1020,8 +1023,16 @@ Function .onInit
${GetParameters} $R0 ${GetParameters} $R0
ClearErrors ClearErrors
${GetOptions} $R0 "/INSTDIR=" $CMDINSTDIR ${GetOptions} $R0 "/INSTDIR=" $CMDINSTDIR
IfErrors +2 0 IfErrors +3 0
StrCpy $INSTDIR "$CMDINSTDIR" StrCpy $INSTDIR "$CMDINSTDIR"
StrCpy $DATADIR "$INSTDIR\var\lib\arangodb3"
# we only want to manipulate INSTDIR here if /INSTDIR is realy set!
${GetParameters} $R0
ClearErrors
${GetOptions} $R0 "/DATABASEDIR=" $CMDINSTDIR
IfErrors +2 0
StrCpy $DATADIR "$CMDINSTDIR"
${GetParameters} $R0 ${GetParameters} $R0
ClearErrors ClearErrors