Commit f1dcb569 by Cam Hayes

Fixed issue where reports folder wasnt being properly created causing a timeout

parent 0a10d405
...@@ -91,9 +91,13 @@ begin ...@@ -91,9 +91,13 @@ begin
end; end;
if clientVersion <> webClientVersion then if clientVersion <> webClientVersion then
begin begin
//Result.AddPair('error',
//'Your browser is running version' + webClientVersion + ' when it should be running ' +
//clientVersion + sLineBreak + 'Please click below to reload.');
Result.AddPair('error', Result.AddPair('error',
'Your browser is running version' + webClientVersion + ' when it should be running ' + 'Version mismatch' + sLineBreak + ' Client version: ' + clientVersion +
clientVersion + sLineBreak + 'Please click below to reload.'); sLineBreak + ' Server version: ' + webClientVersion +
sLineBreak + 'Please click button to clear cache and reload.');
end; end;
finally finally
iniFile.Free; iniFile.Free;
......
...@@ -200,10 +200,10 @@ var ...@@ -200,10 +200,10 @@ var
begin begin
ReportDir := ServerConfig.reportsFolder; ReportDir := ServerConfig.reportsFolder;
if not DirectoryExists(ReportDir) then if not DirectoryExists(ReportDir + 'reports\') then
begin begin
ForceDirectories(ReportDir); ForceDirectories(ReportDir + 'reports\');
Logger.Log(1, 'Reports directory created: ' + ReportDir); Logger.Log(1, 'Reports directory created: ' + ReportDir + 'reports\');
end; end;
reportURL := 'reports/' + FormatDateTime('yyyymmdd_hhnnss', Now) + '.pdf'; reportURL := 'reports/' + FormatDateTime('yyyymmdd_hhnnss', Now) + '.pdf';
......
...@@ -98,11 +98,12 @@ var ...@@ -98,11 +98,12 @@ var
begin begin
ReportDir := ServerConfig.reportsFolder; ReportDir := ServerConfig.reportsFolder;
if not DirectoryExists(ReportDir) then if not DirectoryExists(ReportDir + 'reports\') then
begin begin
ForceDirectories(ReportDir); ForceDirectories(ReportDir + 'reports\');
Logger.Log(1, 'Reports directory created: ' + ReportDir); Logger.Log(1, 'Reports directory created: ' + ReportDir + 'reports\');
end; end;
reportURL := 'reports\' + FormatDateTime('yyyymmdd_hhnnss', Now) + '.pdf'; reportURL := 'reports\' + FormatDateTime('yyyymmdd_hhnnss', Now) + '.pdf';
ReportFileName := reportDir + reportUrl; ReportFileName := reportDir + reportUrl;
......
...@@ -201,11 +201,12 @@ var ...@@ -201,11 +201,12 @@ var
begin begin
ReportDir := ServerConfig.reportsFolder; ReportDir := ServerConfig.reportsFolder;
if not DirectoryExists(ReportDir) then if not DirectoryExists(ReportDir + 'reports\') then
begin begin
ForceDirectories(ReportDir); ForceDirectories(ReportDir + 'reports\');
Logger.Log(1, 'Reports directory created: ' + ReportDir); Logger.Log(1, 'Reports directory created: ' + ReportDir + 'reports\');
end; end;
reportURL := 'reports/' + FormatDateTime('yyyymmdd_hhnnss', Now) + '.pdf'; reportURL := 'reports/' + FormatDateTime('yyyymmdd_hhnnss', Now) + '.pdf';
ReportFileName := reportDir + reportUrl; ReportFileName := reportDir + reportUrl;
......
...@@ -200,11 +200,12 @@ var ...@@ -200,11 +200,12 @@ var
begin begin
ReportDir := ServerConfig.reportsFolder; ReportDir := ServerConfig.reportsFolder;
if not DirectoryExists(ReportDir) then if not DirectoryExists(ReportDir + 'reports\') then
begin begin
ForceDirectories(ReportDir); ForceDirectories(ReportDir + 'reports\');
Logger.Log(1, 'Reports directory created: ' + ReportDir); Logger.Log(1, 'Reports directory created: ' + ReportDir + 'reports\');
end; end;
reportURL := 'reports\' + FormatDateTime('yyyymmdd_hhnnss', Now) + '.pdf'; reportURL := 'reports\' + FormatDateTime('yyyymmdd_hhnnss', Now) + '.pdf';
ReportFileName := reportDir + reportUrl; ReportFileName := reportDir + reportUrl;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
MemoLogLevel=4 MemoLogLevel=4
FileLogLevel=4 FileLogLevel=4
webClientVersion=0.9.11 webClientVersion=0.9.11
LogFileNum=175 LogFileNum=183
[Database] [Database]
--Server=192.168.116.132 --Server=192.168.116.132
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment