7x31/nginxconfig.io
1
0
Fork 0
mirror of https://github.com/digitalocean/nginxconfig.io.git synced 2025-11-03 08:53:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Suppress logging with NODE_ENV (#332)

Browse Source
This commit is contained in:
Matt Cowley
2022-02-25 20:00:45 +00:00
committed by GitHub
parent cddfdc7081
commit 07b0714837
14 changed files with 100 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nginxconfig/build/webpack-dynamic-import.js
View File

@@ -1,5 +1,5 @@
/*
Copyright 2021 DigitalOcean
Copyright 2022 DigitalOcean
This code is licensed under the MIT License.
You may obtain a copy of the License at
@@ -24,8 +24,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
import { info } from '../util/log';
const originalSrcDir = document.currentScript.src.split('/').slice(0, -2).join('/') + '/';
window.__webpackDynamicImportURL = () => {
console.info(`Using ${originalSrcDir} for webpack dynamic import`);
info(`Using ${originalSrcDir} for webpack dynamic import`);
return originalSrcDir;
};

10
src/nginxconfig/templates/app.vue
View File

@@ -134,6 +134,7 @@ THE SOFTWARE.
import analytics from '../util/analytics';
import browserLanguage from '../util/browser_language';
import { defaultPack, availablePacks } from '../util/language_packs';
import { info, error } from '../util/log';
import { setLanguagePack } from '../i18n/setup';
import generators from '../generators';
@@ -243,7 +244,7 @@ THE SOFTWARE.
// Update the locale
setLanguagePack(data.computed).then(() => {
// Done
console.log('Language set to', data.computed);
info('Language set to', data.computed);
this.$data.languagePrevious = data.computed;
this.$data.languageLoading = false;
@@ -251,8 +252,7 @@ THE SOFTWARE.
this.languageSetEvent(!interactive);
}).catch((err) => {
// Error
console.log('Failed to set language to', data.computed);
console.error(err);
error(`Failed to set language to ${data.computed}`, err);
// Fallback to last known good
data.value = this.$data.languagePrevious;
@@ -358,9 +358,9 @@ THE SOFTWARE.
file,
];
});
} catch (e) {
} catch (err) {
// If diff generation goes wrong, don't show any diff
console.error(e);
error('Failed to compute and highlight diff', err);
this.$data.confFilesOutput = Object.entries(newConf).map(([ name, content ]) => {
const safeName = escape(name);
const safeContent = escape(content);

6
src/nginxconfig/templates/prism/bash.vue
View File

@@ -1,5 +1,5 @@
<!--
Copyright 2021 DigitalOcean
Copyright 2022 DigitalOcean
This code is licensed under the MIT License.
You may obtain a copy of the License at
@@ -31,13 +31,15 @@ THE SOFTWARE.
</template>
<script>
import { info } from '../../util/log';
export default {
name: 'BashPrism',
props: {
cmd: String,
},
mounted() {
console.info(`Highlighting ${this.$props.cmd}...`);
info(`Highlighting ${this.$props.cmd}...`);
window.Prism.highlightAllUnder(this.$el);
},
methods: {

5
src/nginxconfig/templates/prism/docker.vue
View File

@@ -1,5 +1,5 @@
<!--
Copyright 2021 DigitalOcean
Copyright 2022 DigitalOcean
This code is licensed under the MIT License.
You may obtain a copy of the License at
@@ -33,6 +33,7 @@ THE SOFTWARE.
<script>
import 'prismjs/components/prism-docker';
import { info } from '../../util/log';
export default {
name: 'DockerPrism',
@@ -42,7 +43,7 @@ THE SOFTWARE.
half: Boolean,
},
mounted() {
console.info(`Highlighting ${this.$props.name}...`);
info(`Highlighting ${this.$props.name}...`);
window.Prism.highlightAllUnder(this.$el);
},
methods: {

6
src/nginxconfig/templates/prism/nginx.vue
View File

@@ -1,5 +1,5 @@
<!--
Copyright 2021 DigitalOcean
Copyright 2022 DigitalOcean
This code is licensed under the MIT License.
You may obtain a copy of the License at
@@ -32,6 +32,8 @@ THE SOFTWARE.
</template>
<script>
import { info } from '../../util/log';
export default {
name: 'NginxPrism',
props: {
@@ -40,7 +42,7 @@ THE SOFTWARE.
half: Boolean,
},
mounted() {
console.info(`Highlighting ${this.$props.name}...`);
info(`Highlighting ${this.$props.name}...`);
window.Prism.highlightAllUnder(this.$el);
},
methods: {

5
src/nginxconfig/templates/prism/yaml.vue
View File

@@ -1,5 +1,5 @@
<!--
Copyright 2021 DigitalOcean
Copyright 2022 DigitalOcean
This code is licensed under the MIT License.
You may obtain a copy of the License at
@@ -33,6 +33,7 @@ THE SOFTWARE.
<script>
import 'prismjs/components/prism-yaml';
import { info } from '../../util/log';
export default {
name: 'YamlPrism',
@@ -42,7 +43,7 @@ THE SOFTWARE.
half: Boolean,
},
mounted() {
console.info(`Highlighting ${this.$props.name}...`);
info(`Highlighting ${this.$props.name}...`);
window.Prism.highlightAllUnder(this.$el);
},
methods: {

6
src/nginxconfig/util/analytics.js
View File

@@ -1,5 +1,5 @@
/*
Copyright 2021 DigitalOcean
Copyright 2022 DigitalOcean
This code is licensed under the MIT License.
You may obtain a copy of the License at
@@ -24,8 +24,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
import { info } from './log';
export default ({ category, action, label, value, nonInteraction }) => {
console.info('Analytics event:', { category, action, label, value, nonInteraction });
info('Analytics event:', { category, action, label, value, nonInteraction });
/*try {
// Google Analytics

31
src/nginxconfig/util/log.js Normal file
View File

@@ -0,0 +1,31 @@
/*
Copyright 2022 DigitalOcean
This code is licensed under the MIT License.
You may obtain a copy of the License at
https://github.com/digitalocean/nginxconfig.io/blob/master/LICENSE or https://mit-license.org/
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions :
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
export const info = process.env.NODE_ENV !== 'production' ? console.info.bind(console) : () => {};
export const log = process.env.NODE_ENV !== 'production' ? console.log.bind(console) : () => {};
export const warn = console.warn.bind(console);
export const error = console.error.bind(console);

6
src/nginxconfig/util/prism_bundle.js
View File

@@ -1,5 +1,5 @@
/*
Copyright 2021 DigitalOcean
Copyright 2022 DigitalOcean
This code is licensed under the MIT License.
You may obtain a copy of the License at
@@ -32,10 +32,12 @@ import 'prismjs/plugins/keep-markup/prism-keep-markup';
import 'prismjs/plugins/toolbar/prism-toolbar';
import 'prismjs/plugins/toolbar/prism-toolbar.css';
import { warn } from './log';
// Custom copy to clipboard (based on the Prism one)
const copyToClipboard = () => {
if (!Prism.plugins.toolbar) {
console.warn('Copy to Clipboard loaded before Toolbar.');
warn('Copy to Clipboard loaded before Toolbar.');
return;
}