Skip to content

Commit 194a9b3

Browse files
authored
Merge pull request #5 from TzviPM/log-severity
🔊 fix(logs): Updates log severity
2 parents 25d09e2 + b9a580b commit 194a9b3

File tree

4 files changed

+35
-31
lines changed

4 files changed

+35
-31
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [1.0.4] - 2023-10-27
11+
12+
### Fixed
13+
- Log severity is now more sensible for running info logs (#5).
14+
1015
## [1.0.3] - 2023-10-27
1116

1217
### Fixed
@@ -26,7 +31,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2631

2732
This was the initial release of `laravel-deploy`.
2833

29-
[unreleased]: https://github.com/TzviPM/laravel-deploy/compare/v1.0.3...HEAD
34+
[unreleased]: https://github.com/TzviPM/laravel-deploy/compare/v1.0.4...HEAD
35+
[1.0.4]: https://github.com/TzviPM/laravel-deploy/compare/v1.0.3...v1.0.4
3036
[1.0.3]: https://github.com/TzviPM/laravel-deploy/compare/v1.0.2...v1.0.3
3137
[1.0.2]: https://github.com/TzviPM/laravel-deploy/compare/v1.0.1...v1.0.2
3238
[1.0.1]: https://github.com/TzviPM/laravel-deploy/compare/v1.0.0...v1.0.1

dist/index.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "laravel-deploy",
3-
"version": "1.0.3",
3+
"version": "1.0.4",
44
"description": "A GitHub Action to create on-demand preview environments for Laravel apps.",
55
"author": "Tzvi Melamed (TzviPM)",
66
"private": true,

src/core/deployment/deployment.service.ts

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export class DeploymentService {
2828
database: Database,
2929
creds: Credentials,
3030
) {
31-
this.logger.debug(`Creating an environment for ${site.name}`);
31+
this.logger.log(`Creating an environment for ${site.name}`);
3232

3333
return dedent`${baseEnv}
3434
APP_URL=${site.name}
@@ -60,92 +60,90 @@ export class DeploymentService {
6060
const dbBackupName = baseDbBranch + '__' + dbBranch;
6161

6262
// Forge
63-
this.logger.debug(`loading server with ID ${serverId}`);
63+
this.logger.log(`loading server with ID ${serverId}`);
6464
const server = await this.forgeService.getServer(serverId);
6565

66-
this.logger.debug(`loading sites for server ${server.id}`);
66+
this.logger.log(`loading sites for server ${server.id}`);
6767
const sites = await server.loadSites();
68-
this.logger.debug(`Checking for site named ${siteName}`);
68+
this.logger.log(`Checking for site named ${siteName}`);
6969
let site = sites.find((site) => site.name === siteName);
7070
if (site != null) {
71-
this.logger.debug(`site exists`);
71+
this.logger.log(`site exists`);
7272
} else {
7373
const databaseName = siteName.replace(/-/g, '_').replace(/[^\w_]/g, '');
74-
this.logger.debug(`Sanitized database name: '${databaseName}'`);
74+
this.logger.log(`Sanitized database name: '${databaseName}'`);
7575

7676
this.logger.log(`Creating site ${siteName}`);
7777
site = await server.createSite(siteName, databaseName);
7878
}
79-
this.logger.debug(`Checking for SSL Certificate on forge`);
79+
this.logger.log(`Checking for SSL Certificate on forge`);
8080
const certs = await site.listCerts();
8181
let cert = certs.find((cert) => cert.domain === site.name);
8282
if (cert != null) {
83-
this.logger.debug('cert exists');
83+
this.logger.log('cert exists');
8484
} else {
8585
this.logger.log(`Creating certificate with LetsEncrypt`);
8686
cert = await site.createLetsEncryptCert();
8787
}
8888
await cert.waitUntilReady();
8989

9090
// PlanetScale
91-
this.logger.debug(`loading database info for PlanetScale`);
91+
this.logger.log(`loading database info for PlanetScale`);
9292
const orgName = this.configService.getPScaleOrganization();
9393
const dbName = this.configService.getPScaleDatabase();
9494

95-
this.logger.debug(`loading organization "${orgName}" from PlanetScale`);
95+
this.logger.log(`loading organization "${orgName}" from PlanetScale`);
9696
const org = await this.pscaleService.getOrganization(orgName);
97-
this.logger.debug(
97+
this.logger.log(
9898
`getting database "${dbName}" for organization "${orgName}"`,
9999
);
100100
const database = await org.getDatabase(dbName);
101101

102-
this.logger.debug(`Getting base branch "${baseDbBranch}"`);
102+
this.logger.log(`Getting base branch "${baseDbBranch}"`);
103103
const baseBranch = await database.getBranch(baseDbBranch);
104-
this.logger.debug(
104+
this.logger.log(
105105
`Creating backup "${dbBackupName}" of branch "${baseDbBranch}"`,
106106
);
107107
const backup = await baseBranch.ensureBackup(dbBackupName);
108-
this.logger.debug(
108+
this.logger.log(
109109
`Forking branch "${dbBranch}" from base branch "${baseDbBranch}"`,
110110
);
111111
const branch = await baseBranch.ensureForkBranch(dbBranch, backup);
112-
this.logger.debug(
112+
this.logger.log(
113113
`Generating credentials named "preview" for branch "${dbBranch}"`,
114114
);
115115
const dbCreds = await branch.forceCreateCredentials('preview');
116116

117117
// Envoyer
118-
this.logger.debug(`loading projects from Envoyer`);
118+
this.logger.log(`loading projects from Envoyer`);
119119
const projects = await this.envoyerService.listProjects();
120-
this.logger.debug(`Checking for project named "${projectName}"`);
120+
this.logger.log(`Checking for project named "${projectName}"`);
121121
let project = projects.find((project) => project.name === projectName);
122122
if (project != null) {
123-
this.logger.debug(`project exists`);
123+
this.logger.log(`project exists`);
124124
} else {
125125
this.logger.log(`Creating project ${projectName} for site ${siteName}`);
126126
project = await this.envoyerService.createProject(projectName, siteName);
127127
}
128128

129-
this.logger.debug(`loading servers for project ${project.id}`);
129+
this.logger.log(`loading servers for project ${project.id}`);
130130
const envoyerServers = await project.listServers();
131-
this.logger.debug(
132-
`Checking for envoyer server with IP ${server.ipAddress}`,
133-
);
131+
this.logger.log(`Checking for envoyer server with IP ${server.ipAddress}`);
134132
let envoyerServer = envoyerServers.find(
135133
(server) => server.ipAddress === server.ipAddress,
136134
);
137135
if (envoyerServer != null) {
138-
this.logger.debug(`envoyer server exists`);
136+
this.logger.log(`envoyer server exists`);
139137
} else {
140138
this.logger.log(`Creating server in Envoyer`);
141139
envoyerServer = await project.createServer('preview', site, phpVersion);
142140
}
143141
const sshKeyName = `Envoyer (${siteName})`;
144-
this.logger.debug(`Checking for SSH key "${sshKeyName}" on forge server`);
142+
this.logger.log(`Checking for SSH key "${sshKeyName}" on forge server`);
145143
const sshKeys = await server.listKeys();
146144
let sshKey = sshKeys.find((key) => key.name === sshKeyName);
147145
if (sshKey != null) {
148-
this.logger.debug('ssh key exists');
146+
this.logger.log('ssh key exists');
149147
} else {
150148
this.logger.log(`Creating ssh key on forge server`);
151149
sshKey = await server.createKey(
@@ -162,12 +160,12 @@ export class DeploymentService {
162160
database,
163161
dbCreds,
164162
);
165-
this.logger.debug(
163+
this.logger.log(
166164
`Pushing environment to server "${envoyerServer.name}" on Envoyer for site "${site.name}"`,
167165
);
168166
await envoyerServer.pushEnvironment(env);
169167

170-
this.logger.debug(`Deploying project ${project.name}`);
168+
this.logger.log(`Deploying project ${project.name}`);
171169
await project.deploy();
172170
}
173171

0 commit comments

Comments
 (0)