Skip to content
This repository was archived by the owner on Aug 21, 2024. It is now read-only.

Commit 08c3b70

Browse files
authored
Disable feathers sync and other unneeded services in jobs and scripts (#9594)
* Disable feathers sync and other unneeded services in jobs and scripts * add back primus
1 parent f36073a commit 08c3b70

12 files changed

+24
-22
lines changed

packages/server-core/src/assets/model-transform/model-transform.job.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import { argsToObject } from '@etherealengine/common/src/utils/objectToCommandLi
3131
import { ModelTransformParameters } from '@etherealengine/engine/src/assets/classes/ModelTransform'
3232
import { transformModel } from '@etherealengine/engine/src/assets/compression/ModelTransformFunctions'
3333
import { ServerMode } from '@etherealengine/server-core/src/ServerState'
34-
import { createFeathersKoaApp } from '@etherealengine/server-core/src/createApp'
34+
import { createFeathersKoaApp, serverJobPipe } from '@etherealengine/server-core/src/createApp'
3535

3636
const modelTransformParameters: ModelTransformParameters = argsToObject(process.argv.slice(3))
3737

@@ -56,7 +56,7 @@ cli.enable('status')
5656

5757
cli.main(async () => {
5858
try {
59-
const app = createFeathersKoaApp(ServerMode.API)
59+
const app = createFeathersKoaApp(ServerMode.API, serverJobPipe)
6060
await app.setup()
6161
await transformModel(modelTransformParameters)
6262
cli.exit(0)

packages/server-core/src/createApp.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ export const serverPipe = pipe(configureOpenAPI(), configurePrimus(), configureR
165165
app: Application
166166
) => Application
167167

168+
export const serverJobPipe = pipe(configurePrimus(), configureK8s()) as (app: Application) => Application
169+
168170
export const createFeathersKoaApp = (
169171
serverMode: ServerTypeMode = ServerMode.API,
170172
configurationPipe = serverPipe

scripts/archive-directory.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import dotenv from 'dotenv-flow'
2929

3030
import { archiverPath } from '@etherealengine/common/src/schema.type.module'
3131
import { ServerMode } from '@etherealengine/server-core/src/ServerState'
32-
import { createFeathersKoaApp } from '@etherealengine/server-core/src/createApp'
32+
import { createFeathersKoaApp, serverJobPipe } from '@etherealengine/server-core/src/createApp'
3333

3434
dotenv.config({
3535
path: appRootPath.path,
@@ -58,7 +58,7 @@ const options = cli.parse({
5858

5959
cli.main(async () => {
6060
try {
61-
const app = createFeathersKoaApp(ServerMode.API)
61+
const app = createFeathersKoaApp(ServerMode.API, serverJobPipe)
6262
await app.setup()
6363
const { directory, jobId, storageProviderName } = options
6464
await app.service(archiverPath).get(null, {

scripts/auto-update-project.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import appRootPath from 'app-root-path'
2727
import cli from 'cli'
2828
import dotenv from 'dotenv-flow'
2929

30-
import { createFeathersKoaApp } from '@etherealengine/server-core/src/createApp'
30+
import { createFeathersKoaApp, serverJobPipe } from '@etherealengine/server-core/src/createApp'
3131
import { checkProjectAutoUpdate } from '@etherealengine/server-core/src/projects/project/project-helper'
3232
import { ServerMode } from '@etherealengine/server-core/src/ServerState'
3333

@@ -56,7 +56,7 @@ const options = cli.parse({
5656

5757
cli.main(async () => {
5858
try {
59-
const app = createFeathersKoaApp(ServerMode.API)
59+
const app = createFeathersKoaApp(ServerMode.API, serverJobPipe)
6060
await app.setup()
6161
await checkProjectAutoUpdate(app, options.projectName)
6262
cli.exit(0)

scripts/convert-resource-urls-to-app.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import cli from 'cli'
3232
import dotenv from 'dotenv-flow'
3333

3434
import { ServerMode } from '@etherealengine/server-core/src/ServerState'
35-
import { createFeathersKoaApp } from '@etherealengine/server-core/src/createApp'
35+
import { createFeathersKoaApp, serverJobPipe } from '@etherealengine/server-core/src/createApp'
3636

3737
dotenv.config({
3838
path: appRootPath.path,
@@ -72,7 +72,7 @@ cli.main(async () => {
7272
})
7373

7474
console.log('options', options)
75-
const app = createFeathersKoaApp(ServerMode.API)
75+
const app = createFeathersKoaApp(ServerMode.API, serverJobPipe)
7676
await app.setup()
7777

7878
const staticResources = await knexClient.from<StaticResourceType>(staticResourcePath)

scripts/convert-static-resource-url.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import knex from 'knex'
3030
import { StaticResourceDatabaseType, staticResourcePath } from '@etherealengine/common/src/schema.type.module'
3131

3232
import { ServerMode } from '@etherealengine/server-core/src/ServerState'
33-
import { createFeathersKoaApp } from '@etherealengine/server-core/src/createApp'
33+
import { createFeathersKoaApp, serverJobPipe } from '@etherealengine/server-core/src/createApp'
3434
import cli from 'cli'
3535
import dotenv from 'dotenv-flow'
3636

@@ -55,7 +55,7 @@ cli.main(async () => {
5555
}
5656
})
5757

58-
const app = createFeathersKoaApp(ServerMode.API)
58+
const app = createFeathersKoaApp(ServerMode.API, serverJobPipe)
5959
await app.setup()
6060

6161
type UpdatedStaticResourceType = StaticResourceDatabaseType & {

scripts/create-project.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import dotenv from 'dotenv-flow'
2929

3030
import { projectPath } from '@etherealengine/common/src/schema.type.module'
3131
import { ServerMode } from '@etherealengine/server-core/src/ServerState'
32-
import { createFeathersKoaApp } from '@etherealengine/server-core/src/createApp'
32+
import { createFeathersKoaApp, serverJobPipe } from '@etherealengine/server-core/src/createApp'
3333

3434
dotenv.config({
3535
path: appRootPath.path,
@@ -56,7 +56,7 @@ const options = cli.parse({
5656

5757
cli.main(async () => {
5858
try {
59-
const app = createFeathersKoaApp(ServerMode.API)
59+
const app = createFeathersKoaApp(ServerMode.API, serverJobPipe)
6060
await app.setup()
6161
const name = options.name.replace(' ', '-')
6262
await app.service(projectPath).create({ name })

scripts/install-projects.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Ethereal Engine. All Rights Reserved.
2626
import { projectPath } from '@etherealengine/common/src/schema.type.module'
2727
import logger from '@etherealengine/server-core/src/ServerLogger'
2828
import { ServerMode } from '@etherealengine/server-core/src/ServerState'
29-
import { createFeathersKoaApp } from '@etherealengine/server-core/src/createApp'
29+
import { createFeathersKoaApp, serverJobPipe } from '@etherealengine/server-core/src/createApp'
3030
import { createDefaultStorageProvider } from '@etherealengine/server-core/src/media/storageprovider/storageprovider'
3131
import { download } from '@etherealengine/server-core/src/projects/project/downloadProjects'
3232
import { getProjectConfig, onProjectEvent } from '@etherealengine/server-core/src/projects/project/project-helper'
@@ -49,7 +49,7 @@ db.url = process.env.MYSQL_URL ?? `mysql://${db.username}:${db.password}@${db.ho
4949

5050
async function installAllProjects() {
5151
try {
52-
const app = createFeathersKoaApp(ServerMode.API)
52+
const app = createFeathersKoaApp(ServerMode.API, serverJobPipe)
5353
await app.setup()
5454
createDefaultStorageProvider()
5555
const localProjectDirectory = path.join(appRootPath.path, 'packages/projects/projects')

scripts/push-project.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import dotenv from 'dotenv-flow'
2929

3030
import { projectPath, userPath } from '@etherealengine/common/src/schema.type.module'
3131
import { ServerMode } from '@etherealengine/server-core/src/ServerState'
32-
import { createFeathersKoaApp } from '@etherealengine/server-core/src/createApp'
32+
import { createFeathersKoaApp, serverJobPipe } from '@etherealengine/server-core/src/createApp'
3333
import { pushProjectToGithub } from '@etherealengine/server-core/src/projects/project/github-helper'
3434

3535
dotenv.config({
@@ -62,7 +62,7 @@ const options = cli.parse({
6262

6363
cli.main(async () => {
6464
try {
65-
const app = createFeathersKoaApp(ServerMode.API)
65+
const app = createFeathersKoaApp(ServerMode.API, serverJobPipe)
6666
await app.setup()
6767
const { userId, projectId, reset, commitSHA, storageProviderName, jobId } = options
6868
const user = await app.service(userPath).get(userId)

scripts/update-cloudfront-function.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import cli from 'cli'
2828

2929
import { InstalledRoutesInterface } from '@etherealengine/common/src/interfaces/Route'
3030
import { routePath } from '@etherealengine/common/src/schema.type.module'
31-
import { createFeathersKoaApp } from '@etherealengine/server-core/src/createApp'
31+
import { createFeathersKoaApp, serverJobPipe } from '@etherealengine/server-core/src/createApp'
3232
import { getStorageProvider } from '@etherealengine/server-core/src/media/storageprovider/storageprovider'
3333
import { ServerMode } from '@etherealengine/server-core/src/ServerState'
3434

@@ -53,7 +53,7 @@ const options = cli.parse({
5353
})
5454
cli.main(async () => {
5555
try {
56-
const app = await createFeathersKoaApp(ServerMode.API)
56+
const app = await createFeathersKoaApp(ServerMode.API, serverJobPipe)
5757
await app.setup()
5858
const storageProvider = getStorageProvider()
5959
const routes = (await getAllRoutes(app, [], 0)).map((item) => item.route)

0 commit comments

Comments
 (0)