mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Windows MSI : dump server error log to MSI log on installation failure.

Browse source 
On failure, installer executes rollback actions, among them removing newly
created data directory with all files in it.

This patch makes installer at  dump mariadb error log to installer log,
before removing the files. This should make troubleshooting a little easier.
This commit is contained in:
Vladislav Vaintroub 2017-10-03 00:13:58 +00:00
parent de4a00d4f7
commit e6862cf1ff
1 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
win/packaging/ca/CustomAction.cpp
View file

@ -767,6 +767,49 @@ extern "C" UINT __stdcall PresetDatabaseProperties(MSIHANDLE hInstall)
LExit:
return WcaFinalize(er);
}
static BOOL FindErrorLog(const wchar_t *dir, wchar_t * ErrorLogFile, size_t ErrorLogLen)
{
WIN32_FIND_DATA FindFileData;
HANDLE hFind;
wchar_t name[MAX_PATH];
wcsncpy_s(name,dir, MAX_PATH);
wcsncat_s(name,L"\\*.err", MAX_PATH);
hFind = FindFirstFileW(name,&FindFileData);
if (hFind != INVALID_HANDLE_VALUE)
{
_snwprintf(ErrorLogFile, ErrorLogLen,
L"%s\\%s",dir, FindFileData.cFileName);
FindClose(hFind);
return TRUE;
}
return FALSE;
}
static void DumpErrorLog(const wchar_t *dir)
{
wchar_t filepath[MAX_PATH];
if (!FindErrorLog(dir, filepath, MAX_PATH))
return;
FILE *f= _wfopen(filepath, L"r");
if (!f)
return;
char buf[2048];
WcaLog(LOGMSG_STANDARD,"=== dumping error log %S === ",filepath);
while (fgets(buf, sizeof(buf), f))
{
/* Strip off EOL chars. */
size_t len = strlen(buf);
if (len > 0 && buf[len-1] == '\n')
buf[--len]= 0;
if (len > 0 && buf[len-1] == '\r')
buf[--len]= 0;
WcaLog(LOGMSG_STANDARD,"%s",buf);
}
fclose(f);
WcaLog(LOGMSG_STANDARD,"=== end of error log ===");
}
/* Remove service and data directory created by CreateDatabase operation */
extern "C" UINT __stdcall CreateDatabaseRollback(MSIHANDLE hInstall)
{
@ -774,7 +817,6 @@ extern "C" UINT __stdcall CreateDatabaseRollback(MSIHANDLE hInstall)
UINT er = ERROR_SUCCESS;
wchar_t* service= 0;
wchar_t* dir= 0;
hr = WcaInitialize(hInstall, __FUNCTION__);
ExitOnFailure(hr, "Failed to initialize");
WcaLog(LOGMSG_STANDARD, "Initialized.");
@ -804,6 +846,7 @@ extern "C" UINT __stdcall CreateDatabaseRollback(MSIHANDLE hInstall)
}
if(dir)
{
DumpErrorLog(dir);
ExecRemoveDataDirectory(dir);
}
LExit: