diff --git a/.vscode/launch.json b/.vscode/launch.json index fbc301e6..6c5da20a 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -47,16 +47,18 @@ // "AYANOVA_DEFAULT_TRANSLATION": "en", // //"AYANOVA_PERMANENTLY_ERASE_DATABASE": "true", "AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;CommandTimeout=120;", - "AYANOVA_DATA_PATH": "c:\\temp\\ravendata", + //"AYANOVA_DATA_PATH": "c:\\temp\\ravendata", // //"AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=abraxis;Database=AyaNova;CommandTimeout=120;", // "AYANOVA_USE_URLS": "http://*:7575;", // //"AYANOVA_REPORT_RENDERING_TIMEOUT": "20000", // //"AYANOVA_REPORT_RENDERING_MAX_INSTANCES": "3", - //"AYANOVA_ATTACHMENT_FILES_PATH": "c:\\temp\\RavenTestData\\userfiles", + "AYANOVA_ATTACHMENT_FILES_PATH": "c:\\temp\\RavenTestData\\userfiles", // "AYANOVA_ATTACHMENT_FILES_PATH":"%ProgramData%\\ayanova\\userfiles", - // "AYANOVA_BACKUP_FILES_PATH": "c:\\temp\\RavenTestData\\backupfiles", - // "AYANOVA_TEMP_FILES_PATH": "c:\\temp\\RavenTestData\\tempfiles", - // "AYANOVA_SERVER_TEST_MODE": "false", + "AYANOVA_BACKUP_FILES_PATH": "c:\\temp\\RavenTestData\\backupfiles", + "AYANOVA_TEMP_FILES_PATH": "c:\\temp\\RavenTestData\\tempfiles", + "AYANOVA_SERVER_TEST_MODE": "false", +"AYANOVA_LOG_PATH": "c:\\temp\\RavenTestData\\logs", + // "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", // "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-8", "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_14\\bin\\" diff --git a/server/AyaNova/util/ServerBootConfig.cs b/server/AyaNova/util/ServerBootConfig.cs index fd5ef413..2ec8888d 100644 --- a/server/AyaNova/util/ServerBootConfig.cs +++ b/server/AyaNova/util/ServerBootConfig.cs @@ -185,14 +185,14 @@ namespace AyaNova.Util //FOLDERS string DataFolderPath = ActualFullPath(config.GetValue("AYANOVA_DATA_PATH")); string LogPath = ActualFullPath(config.GetValue("AYANOVA_LOG_PATH")); - string AttachmentFilesPath = ActualFullPath(config.GetValue("AYANOVA_USER_FILES_PATH")); + string AttachmentFilesPath = ActualFullPath(config.GetValue("AYANOVA_ATTACHMENT_FILES_PATH")); string BackupFilesPath = ActualFullPath(config.GetValue("AYANOVA_BACKUP_FILES_PATH")); string TempFilesPath = ActualFullPath(config.GetValue("AYANOVA_TEMP_FILES_PATH")); AYANOVA_BACKUP_PG_DUMP_PATH = ActualFullPath(config.GetValue("AYANOVA_BACKUP_PG_DUMP_PATH")); if (string.IsNullOrWhiteSpace(DataFolderPath)) { - //then they better have paths for *everything* specified + //In this case *must* have paths for *everything* specified if (string.IsNullOrWhiteSpace(LogPath)) throw new System.ArgumentNullException("AYANOVA_LOG_PATH configuration setting missing and required"); if (string.IsNullOrWhiteSpace(AttachmentFilesPath)) @@ -203,14 +203,13 @@ namespace AyaNova.Util throw new System.ArgumentNullException("AYANOVA_TEMP_FILES_PATH configuration setting missing and required"); } - else - { - //set any unspecified paths to the defaults - AYANOVA_LOG_PATH = (string.IsNullOrWhiteSpace(LogPath)) ? Path.Combine(DataFolderPath, "logs") : LogPath; - AYANOVA_ATTACHMENT_FILES_PATH = (string.IsNullOrWhiteSpace(AttachmentFilesPath)) ? Path.Combine(DataFolderPath, "attachments") : AttachmentFilesPath; - AYANOVA_BACKUP_FILES_PATH = (string.IsNullOrWhiteSpace(BackupFilesPath)) ? Path.Combine(DataFolderPath, "backups") : BackupFilesPath; - AYANOVA_TEMP_FILES_PATH = (string.IsNullOrWhiteSpace(TempFilesPath)) ? Path.Combine(DataFolderPath, "temp") : TempFilesPath; - } + + //set paths + AYANOVA_LOG_PATH = (string.IsNullOrWhiteSpace(LogPath)) ? Path.Combine(DataFolderPath, "logs") : LogPath; + AYANOVA_ATTACHMENT_FILES_PATH = (string.IsNullOrWhiteSpace(AttachmentFilesPath)) ? Path.Combine(DataFolderPath, "attachments") : AttachmentFilesPath; + AYANOVA_BACKUP_FILES_PATH = (string.IsNullOrWhiteSpace(BackupFilesPath)) ? Path.Combine(DataFolderPath, "backups") : BackupFilesPath; + AYANOVA_TEMP_FILES_PATH = (string.IsNullOrWhiteSpace(TempFilesPath)) ? Path.Combine(DataFolderPath, "temp") : TempFilesPath; + #endregion server BASICS