Mirrors/Stirling-PDF
Mirrors/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Frooodle/Stirling-PDF.git synced 2025-01-23 00:06:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

#2700 updating log messages

Browse Source
This commit is contained in:
Dario Ghunney Ware 2024-12-30 12:35:43 +00:00
parent 3a2c874e52
commit 88bfc6d4fd
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
exampleYmlFiles/docker-compose-latest-security.yml
View File

@ -1,7 +1,7 @@
services: services:
stirling-pdf: stirling-pdf:
container_name: Stirling-PDF-Security container_name: Stirling-PDF-Security
image: stirlingtools/stirling-pdf:latest image: stirlingtools/stirling-pdf:test
deploy: deploy:
resources: resources:
limits: limits:
@ -36,7 +36,7 @@ services:
SYSTEM_DATASOURCE_HOSTNAME: "db" SYSTEM_DATASOURCE_HOSTNAME: "db"
SYSTEM_DATASOURCE_PORT: "5432" SYSTEM_DATASOURCE_PORT: "5432"
SYSTEM_DATASOURCE_NAME: "stirling_pdf" SYSTEM_DATASOURCE_NAME: "stirling_pdf"
SYSTEM_DATASOURCE_ENABLECUSTOMDATABASE: "false" SYSTEM_DATASOURCE_ENABLECUSTOMDATABASE: "true"
SYSTEM_DATASOURCE_USERNAME: "admin" SYSTEM_DATASOURCE_USERNAME: "admin"
SYSTEM_DATASOURCE_PASSWORD: "stirling" SYSTEM_DATASOURCE_PASSWORD: "stirling"
restart: on-failure:5 restart: on-failure:5

3
src/main/java/stirling/software/SPDF/config/security/database/DatabaseConfig.java
View File

@ -46,7 +46,7 @@ public class DatabaseConfig {
DataSourceBuilder<?> dataSourceBuilder = DataSourceBuilder.create(); DataSourceBuilder<?> dataSourceBuilder = DataSourceBuilder.create();
if (!datasource.isEnableCustomDatabase()) { if (!datasource.isEnableCustomDatabase()) {
log.debug("Using default H2 database"); log.info("Using default H2 database");
dataSourceBuilder.driverClassName(DEFAULT_DRIVER); dataSourceBuilder.driverClassName(DEFAULT_DRIVER);
dataSourceBuilder.url(DATASOURCE_DEFAULT_URL); dataSourceBuilder.url(DATASOURCE_DEFAULT_URL);
@ -55,6 +55,7 @@ public class DatabaseConfig {
return dataSourceBuilder.build(); return dataSourceBuilder.build();
} }
log.info("Using custom database");
dataSourceBuilder.driverClassName(getDriverClassName(datasource.getType())); dataSourceBuilder.driverClassName(getDriverClassName(datasource.getType()));
dataSourceBuilder.url( dataSourceBuilder.url(
getDataSourceUrl( getDataSourceUrl(

2
src/main/resources/settings.yml.template
View File

@ -86,7 +86,7 @@ system:
tessdataDir: /usr/share/tessdata # path to the directory containing the Tessdata files. This setting is relevant for Windows systems. For Windows users, this path should be adjusted to point to the appropriate directory where the Tessdata files are stored. tessdataDir: /usr/share/tessdata # path to the directory containing the Tessdata files. This setting is relevant for Windows systems. For Windows users, this path should be adjusted to point to the appropriate directory where the Tessdata files are stored.
enableAnalytics: undefined # set to 'true' to enable analytics, set to 'false' to disable analytics; for enterprise users, this is set to true enableAnalytics: undefined # set to 'true' to enable analytics, set to 'false' to disable analytics; for enterprise users, this is set to true
datasource: datasource:
enableCustomDatabase: false # set this property to 'true' if you would like to use the default database configuration enableCustomDatabase: true # set this property to 'true' if you would like to use the default database configuration
type: postgresql # the type of the database to set (e.g. 'h2', 'postgresql') type: postgresql # the type of the database to set (e.g. 'h2', 'postgresql')
hostName: localhost # the host name to use for the database url. Set to 'localhost' when running the app locally. Set to match the name of the container name of your database container when running the app on a server (Docker configuration) hostName: localhost # the host name to use for the database url. Set to 'localhost' when running the app locally. Set to match the name of the container name of your database container when running the app on a server (Docker configuration)
port: 5432 # set the port number of the database. Ensure this matches the port the database is listening to port: 5432 # set the port number of the database. Ensure this matches the port the database is listening to