From c9aecd51f3810e0cd5f36bf0295195c26dfda314 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 5 Sep 2022 13:15:58 +0200 Subject: [PATCH] remove console logs --- apps/api/src/index.ts | 9 +-------- apps/api/src/lib/common.ts | 8 -------- apps/api/src/routes/api/v1/destinations/handlers.ts | 7 ------- 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/apps/api/src/index.ts b/apps/api/src/index.ts index 9befdd981..4b3b3998f 100644 --- a/apps/api/src/index.ts +++ b/apps/api/src/index.ts @@ -143,7 +143,6 @@ fastify.listen({ port, host }, async (err: any, address: any) => { ]) }); async function getIPAddress() { - console.log('getIPAddress') const { publicIpv4, publicIpv6 } = await import('public-ip') try { const settings = await listSettings(); @@ -171,7 +170,6 @@ async function initServer() { } catch (error) { } } async function getArch() { - console.log('getArch') try { const settings = await prisma.setting.findFirst({}) if (settings && !settings.arch) { @@ -180,10 +178,7 @@ async function getArch() { } catch (error) { } } - - async function configureRemoteDockers() { - console.log('configureRemoteDockers') try { const remoteDocker = await prisma.destinationDocker.findMany({ where: { remoteVerified: true, remoteEngine: true } @@ -193,7 +188,5 @@ async function configureRemoteDockers() { await createRemoteEngineConfiguration(docker.id) } } - } catch (error) { - console.log(error) - } + } catch (error) { } } diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts index 7595083f1..5973ff69c 100644 --- a/apps/api/src/lib/common.ts +++ b/apps/api/src/lib/common.ts @@ -451,17 +451,13 @@ export async function getFreeSSHLocalPort(id: string): Promise } export async function createRemoteEngineConfiguration(id: string) { - const homedir = os.homedir(); const sshKeyFile = `/tmp/id_rsa-${id}` - console.log(sshKeyFile) const localPort = await getFreeSSHLocalPort(id); - console.log(localPort) const { sshKey: { privateKey }, remoteIpAddress, remotePort, remoteUser } = await prisma.destinationDocker.findFirst({ where: { id }, include: { sshKey: true } }) await fs.writeFile(sshKeyFile, decrypt(privateKey) + '\n', { encoding: 'utf8', mode: 400 }) // Needed for remote docker compose const { stdout: numberOfSSHAgentsRunning } = await asyncExecShell(`ps ax | grep [s]sh-agent | grep coolify-ssh-agent.pid | grep -v grep | wc -l`) - console.log({ numberOfSSHAgentsRunning }) if (numberOfSSHAgentsRunning !== '' && Number(numberOfSSHAgentsRunning.trim()) == 0) { try { await fs.stat(`/tmp/coolify-ssh-agent.pid`) @@ -472,11 +468,9 @@ export async function createRemoteEngineConfiguration(id: string) { await asyncExecShell(`SSH_AUTH_SOCK=/tmp/coolify-ssh-agent.pid ssh-add -q ${sshKeyFile}`) const { stdout: numberOfSSHTunnelsRunning } = await asyncExecShell(`ps ax | grep 'ssh -F /dev/null -o StrictHostKeyChecking no -fNL ${localPort}:localhost:${remotePort}' | grep -v grep | wc -l`) - console.log({ numberOfSSHTunnelsRunning }) if (numberOfSSHTunnelsRunning !== '' && Number(numberOfSSHTunnelsRunning.trim()) == 0) { try { await asyncExecShell(`SSH_AUTH_SOCK=/tmp/coolify-ssh-agent.pid ssh -F /dev/null -o "StrictHostKeyChecking no" -fNL ${localPort}:localhost:${remotePort} ${remoteUser}@${remoteIpAddress}`) - } catch (error) { console.log(error) } @@ -499,7 +493,6 @@ export async function createRemoteEngineConfiguration(id: string) { } catch (error) { await fs.mkdir(`${homedir}/.ssh/`) } - console.log(config.toString()) return await fs.writeFile(`${homedir}/.ssh/config`, sshConfig.stringify(config)) } export async function executeDockerCmd({ debug, buildId, applicationId, dockerId, command }: { debug?: boolean, buildId?: string, applicationId?: string, dockerId: string, command: string }): Promise { @@ -1369,7 +1362,6 @@ export function makeLabelForServices(type) { } export function errorHandler({ status = 500, message = 'Unknown error.' }: { status: number, message: string | any }) { if (message.message) message = message.message - console.log({ status, message }) throw { status, message }; } export async function generateSshKeyPair(): Promise<{ publicKey: string; privateKey: string }> { diff --git a/apps/api/src/routes/api/v1/destinations/handlers.ts b/apps/api/src/routes/api/v1/destinations/handlers.ts index 8b0bb5fc8..1c8831d25 100644 --- a/apps/api/src/routes/api/v1/destinations/handlers.ts +++ b/apps/api/src/routes/api/v1/destinations/handlers.ts @@ -209,28 +209,21 @@ export async function verifyRemoteDockerEngine(request: FastifyRequest, try { const { id } = request.params; await createRemoteEngineConfiguration(id); - const { remoteIpAddress, remoteUser, network, isCoolifyProxyUsed } = await prisma.destinationDocker.findFirst({ where: { id } }) const host = `ssh://${remoteUser}@${remoteIpAddress}` - console.log({ host }) const { stdout } = await asyncExecShell(`DOCKER_HOST=${host} docker network ls --filter 'name=${network}' --no-trunc --format "{{json .}}"`); - console.log({ stdout }) if (!stdout) { await asyncExecShell(`DOCKER_HOST=${host} docker network create --attachable ${network}`); } const { stdout: coolifyNetwork } = await asyncExecShell(`DOCKER_HOST=${host} docker network ls --filter 'name=coolify-infra' --no-trunc --format "{{json .}}"`); - console.log({ coolifyNetwork }) - if (!coolifyNetwork) { await asyncExecShell(`DOCKER_HOST=${host} docker network create --attachable coolify-infra`); } - console.log({ isCoolifyProxyUsed }) if (isCoolifyProxyUsed) await startTraefikProxy(id); await prisma.destinationDocker.update({ where: { id }, data: { remoteVerified: true } }) return reply.code(201).send() } catch ({ status, message }) { - console.log({ status, message }) return errorHandler({ status, message }) } }