Compare commits

..
5 changed files with 63 additions and 162 deletions
+2 -7
View File
@@ -13,7 +13,7 @@
<maven.compiler.target>17</maven.compiler.target> <maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hibernate.version>7.1.7.Final</hibernate.version> <hibernate.version>7.1.7.Final</hibernate.version>
<postgresql.version>42.7.5</postgresql.version> <postgresql.version>42.7.7</postgresql.version>
<hikaricp.version>5.1.0</hikaricp.version> <hikaricp.version>5.1.0</hikaricp.version>
<log4j.version>2.23.1</log4j.version> <log4j.version>2.23.1</log4j.version>
<junit.version>5.10.2</junit.version> <junit.version>5.10.2</junit.version>
@@ -55,7 +55,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId> <artifactId>log4j-slf4j2-impl</artifactId>
<version>${log4j.version}</version> <version>${log4j.version}</version>
</dependency> </dependency>
@@ -83,11 +83,6 @@
<artifactId>protobuf-java</artifactId> <artifactId>protobuf-java</artifactId>
<version>4.32.0</version> <version>4.32.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.44.1.0</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
@@ -1,6 +1,5 @@
package com.mediamanager; package com.mediamanager;
import com.mediamanager.service.database.DatabaseManager;
import com.mediamanager.service.delegate.DelegateActionManager; import com.mediamanager.service.delegate.DelegateActionManager;
import com.mediamanager.service.ipc.IPCManager; import com.mediamanager.service.ipc.IPCManager;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
@@ -10,7 +9,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Properties; import java.util.Properties;
import com.mediamanager.service.database.SqliteDatabaseManager; import com.mediamanager.service.database.DatabaseManager;
public class MediaManagerApplication { public class MediaManagerApplication {
private static final Logger logger = LogManager.getLogger(MediaManagerApplication.class); private static final Logger logger = LogManager.getLogger(MediaManagerApplication.class);
@@ -19,46 +18,13 @@ public class MediaManagerApplication {
private static DelegateActionManager actionManager; private static DelegateActionManager actionManager;
private static IPCManager ipcManager; private static IPCManager ipcManager;
public enum ApplicationMode {
LOCAL("local"),
SERVER("server");
private final String value;
ApplicationMode(String value) {
this.value = value;
}
}
public static void main(String[] args) { public static void main(String[] args) {
logger.info("Starting MediaManager Core Application..."); logger.info("Starting MediaManager Core Application...");
try { try {
// Load configuration // Load configuration
loadConfiguration(); loadConfiguration();
String runTypeString = config.getProperty("runtype","local"); databaseManager = new DatabaseManager(config);
ApplicationMode mode = null;
for (ApplicationMode am : ApplicationMode.values()) {
if (am.value.equalsIgnoreCase(runTypeString)) {
mode = am;
break;
}
}
if (mode == null) {
logger.error("Invalid run type: {}", runTypeString);
throw new Exception("Invalid run type: " + runTypeString);
}
logger.info("Run type: {}", mode);
switch (mode) {
case LOCAL:
logger.info("Starting local database...");
databaseManager = new SqliteDatabaseManager(config);
break;
case SERVER:
throw new Exception("Server mode not yet implemented");
default:
}
databaseManager.init(); databaseManager.init();
actionManager = new DelegateActionManager(); actionManager = new DelegateActionManager();
actionManager.start(); actionManager.start();
@@ -136,4 +102,4 @@ public class MediaManagerApplication {
public static Properties getConfig() { public static Properties getConfig() {
return config; return config;
} }
} }
@@ -1,28 +1,55 @@
package com.mediamanager.service.database; package com.mediamanager.service.database;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import java.sql.Connection; import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import java.util.Properties; import java.util.Properties;
public abstract class DatabaseManager {
protected final Properties configuration;
protected Connection connection;
protected static final Logger logger = LogManager.getLogger(DatabaseManager.class);
public class DatabaseManager {
private final Properties configuration;
private Connection connection;
private static final Logger logger = LogManager.getLogger(DatabaseManager.class);
public DatabaseManager(Properties config) { public DatabaseManager(Properties config) {
this.configuration = config; this.configuration = config;
logger.debug("DatabaseManager created with configuration:"); logger.debug("DatabaseManager created with configuration:");
} }
public abstract void init() throws Exception; public void init() throws Exception {
logger.info("Initializing database connection...");
validateConfiguration();
protected abstract Connection createConnection() throws Exception; String databaseType = configuration.getProperty("database.type");
String databaseUrl = configuration.getProperty("database.url");
String databaseUsername = configuration.getProperty("database.username");
String databasePassword = configuration.getProperty("database.password");
String databasePort = configuration.getProperty("database.port");
String databaseName = configuration.getProperty("database.name");
protected void performSanityChecks() throws SQLException {
String connectionString = String.format("jdbc:postgresql://%s:%s/%s", databaseUrl, databasePort, databaseName);
logger.debug("Attempting to connect to: {}", connectionString);
try {
connection = DriverManager.getConnection(connectionString, databaseUsername, databasePassword);
logger.info("Database connection established successfully");
performSanityChecks();
logger.info("Database sanity checks passed successfully");
} catch (SQLException e) {
logger.error("Failed to connect to database", e);
throw new Exception("Database connection failed: " + e.getMessage(), e);
}
}
private void performSanityChecks() throws SQLException {
logger.debug("Performing sanity checks..."); logger.debug("Performing sanity checks...");
try (Statement stmt = connection.createStatement()) { try (Statement stmt = connection.createStatement()) {
stmt.execute("SELECT 1"); stmt.execute("SELECT 1");
@@ -32,6 +59,27 @@ public abstract class DatabaseManager {
String databaseProductVersion = connection.getMetaData().getDatabaseProductVersion(); String databaseProductVersion = connection.getMetaData().getDatabaseProductVersion();
logger.info("Connected to database: {} v{}", databaseProductName, databaseProductVersion); logger.info("Connected to database: {} v{}", databaseProductName, databaseProductVersion);
} }
private void validateConfiguration() throws Exception {
String[] requiredProperties = {
"database.url",
"database.username",
"database.password",
"database.port",
"database.name"
};
for (String property : requiredProperties) {
if (configuration.getProperty(property) == null ||
configuration.getProperty(property).trim().isEmpty()) {
throw new Exception("Required database configuration missing: " + property);
}
}
logger.debug("Database configuration validated successfully");
}
public Connection getConnection() { public Connection getConnection() {
return connection; return connection;
@@ -50,13 +98,4 @@ public abstract class DatabaseManager {
logger.debug("No database connection to close"); logger.debug("No database connection to close");
} }
} }
protected boolean testConnection() { }
try (Statement stmt = connection.createStatement()) {
stmt.execute("SELECT 1");
return true;
} catch (SQLException e) {
logger.error("Connection test failed", e);
return false;
}
}
}
@@ -1,97 +0,0 @@
package com.mediamanager.service.database;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
public class SqliteDatabaseManager extends DatabaseManager {
private static final Logger logger = LogManager.getLogger(SqliteDatabaseManager.class);
private String connectionUrl;
public SqliteDatabaseManager(Properties config) {
super(config);
}
@Override
public void init() throws Exception {
logger.info("Initializing SQLite database...");
String dataDir = configuration.getProperty("database.dir",
System.getProperty("user.home") + "/.mediamanager/db");
String dbFilename = configuration.getProperty("database.filename", "mediamanager.db");
String driverClassName = configuration.getProperty("database.driver", "org.sqlite.JDBC");
try {
Class.forName(driverClassName);
}catch(ClassNotFoundException e) {
logger.error("Failed to load SQLite driver", e);
throw e;
}
Path dataPath = Paths.get(dataDir);
if (!Files.exists(dataPath)) {
Files.createDirectories(dataPath);
logger.debug("Created database directory: {}", dataDir);
}
Path dbFile = dataPath.resolve(dbFilename);
this.connectionUrl = "jdbc:sqlite:" + dbFile.toAbsolutePath().toString();
logger.info("Database file path: {}", dbFile);
logger.info("Connection URL: {}", this.connectionUrl);
this.connection = createConnection();
configurePerformancePragmas();
performSanityChecks();
ensureSchemaExists();
logger.info("SQLite database initialized successfully");
}
@Override
protected Connection createConnection() throws Exception {
try {
// O driver org.xerial.sqlite-jdbc é carregado automaticamente aqui
Connection conn = DriverManager.getConnection(this.connectionUrl);
logger.debug("Got connection to SQLite file");
return conn;
} catch (SQLException e) {
logger.error("Failed to create SQLite connection", e);
throw new Exception("SQLite connection failed: " + e.getMessage(), e);
}
}
private void configurePerformancePragmas() throws SQLException {
try (Statement stmt = connection.createStatement()) {
stmt.execute("PRAGMA journal_mode=WAL;");
stmt.execute("PRAGMA foreign_keys=ON;");
stmt.execute("PRAGMA synchronous=NORMAL;");
stmt.execute("PRAGMA busy_timeout=5000;");
logger.debug("SQLite performance PRAGMAs applied (WAL, Synchronous, ForeignKeys).");
}
}
private void ensureSchemaExists() throws SQLException {
}
@Override
public void close() {
super.close();
logger.info("SQLite resources released.");
}
}
+1 -3
View File
@@ -21,8 +21,6 @@ hibernate.format_sql=true
ipc.pipe.name=mediamanager-pipe ipc.pipe.name=mediamanager-pipe
ipc.pipe.path=/tmp/mediamanager ipc.pipe.path=/tmp/mediamanager
ipc.buffer.size=8192 ipc.buffer.size=8192
runtype=local
ipc.socket.path=/tmp/mediamanager ipc.socket.path=/tmp/mediamanager