KevinMidboe/immich
1
0
Fork 0
mirror of https://github.com/KevinMidboe/immich.git synced 2025-10-29 17:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(server/machine-learning): Configurable port (#1386)

Browse Source 
* feat(server/machine-learning): Configurable port

* feat(server/machine-learning): Address PR comments.

* feat(server/machine-learning): Simplify

Co-authored-by: Alex <alex.tran1502@gmail.com>
This commit is contained in:
Skyler Mäntysaari
2023-01-24 06:18:35 +02:00
committed by GitHub
parent b7d34079d9
commit 9d337bf4dc
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
machine-learning/src/main.ts
View File

@@ -5,7 +5,9 @@ import { Logger } from '@nestjs/common';
async function bootstrap() { async function bootstrap() {
const app = await NestFactory.create(AppModule); const app = await NestFactory.create(AppModule);
await app.listen(3003, () => { const port = Number(process.env.MACHINE_LEARNING_PORT) || 3003;
await app.listen(port, () => {
if (process.env.NODE_ENV == 'development') { if (process.env.NODE_ENV == 'development') {
Logger.log( Logger.log(
'Running Immich Machine Learning in DEVELOPMENT environment', 'Running Immich Machine Learning in DEVELOPMENT environment',

8
server/apps/immich/src/main.ts
View File

@@ -27,6 +27,8 @@ async function bootstrap() {
app.enableCors(); app.enableCors();
} }
const serverPort = Number(process.env.SERVER_PORT) || 3001;
const redisIoAdapter = new RedisIoAdapter(app); const redisIoAdapter = new RedisIoAdapter(app);
await redisIoAdapter.connectToRedis(); await redisIoAdapter.connectToRedis();
app.useWebSocketAdapter(redisIoAdapter); app.useWebSocketAdapter(redisIoAdapter);
@@ -59,7 +61,7 @@ async function bootstrap() {
customSiteTitle: 'Immich API Documentation', customSiteTitle: 'Immich API Documentation',
}); });
await app.listen(3001, () => { await app.listen(serverPort, () => {
if (process.env.NODE_ENV == 'development') { if (process.env.NODE_ENV == 'development') {
// Generate API Documentation only in development mode // Generate API Documentation only in development mode
const outputPath = path.resolve(process.cwd(), 'immich-openapi-specs.json'); const outputPath = path.resolve(process.cwd(), 'immich-openapi-specs.json');
@@ -67,7 +69,9 @@ async function bootstrap() {
} }
const envName = (process.env.NODE_ENV || 'development').toUpperCase(); const envName = (process.env.NODE_ENV || 'development').toUpperCase();
logger.log(`Running Immich Server in ${envName} environment - version ${SERVER_VERSION}`); logger.log(
`Running Immich Server in ${envName} environment - version ${SERVER_VERSION} - Listening on port: ${serverPort}`,
);
}); });
logger.warn(`Machine learning is ${MACHINE_LEARNING_ENABLED ? 'enabled' : 'disabled'}`); logger.warn(`Machine learning is ${MACHINE_LEARNING_ENABLED ? 'enabled' : 'disabled'}`);

8
server/apps/microservices/src/main.ts
View File

@@ -12,13 +12,17 @@ async function bootstrap() {
logger: getLogLevels(), logger: getLogLevels(),
}); });
const listeningPort = Number(process.env.MACHINE_LEARNING_PORT) || 3002;
const redisIoAdapter = new RedisIoAdapter(app); const redisIoAdapter = new RedisIoAdapter(app);
await redisIoAdapter.connectToRedis(); await redisIoAdapter.connectToRedis();
app.useWebSocketAdapter(redisIoAdapter); app.useWebSocketAdapter(redisIoAdapter);
await app.listen(3002, () => { await app.listen(listeningPort, () => {
const envName = (process.env.NODE_ENV || 'development').toUpperCase(); const envName = (process.env.NODE_ENV || 'development').toUpperCase();
logger.log(`Running Immich Microservices in ${envName} environment - version ${SERVER_VERSION}`); logger.log(
`Running Immich Microservices in ${envName} environment - version ${SERVER_VERSION} - Listening on port: ${listeningPort}`,
);
}); });
} }
bootstrap(); bootstrap();

3
server/libs/common/src/config/app.config.ts
View File

@@ -35,5 +35,8 @@ export const immichAppConfig: ConfigModuleOptions = {
DISABLE_REVERSE_GEOCODING: Joi.boolean().optional().valid(true, false).default(false), DISABLE_REVERSE_GEOCODING: Joi.boolean().optional().valid(true, false).default(false),
REVERSE_GEOCODING_PRECISION: Joi.number().optional().valid(0, 1, 2, 3).default(3), REVERSE_GEOCODING_PRECISION: Joi.number().optional().valid(0, 1, 2, 3).default(3),
LOG_LEVEL: Joi.string().optional().valid('simple', 'verbose', 'debug', 'log', 'warn', 'error').default('log'), LOG_LEVEL: Joi.string().optional().valid('simple', 'verbose', 'debug', 'log', 'warn', 'error').default('log'),
MACHINE_LEARNING_PORT: Joi.number().optional(),
MICROSERVICES_PORT: Joi.number().optional(),
SERVER_PORT: Joi.number().optional(),
}), }),
}; };