Skip to content

Commit

Permalink
Moved core/server/lib/common/logging to core/shared/logging (#11857)
Browse files Browse the repository at this point in the history
- Represents that logging is shared across all parts of Ghost at present
  * moved core/server/lib/common/logging to core/shared/logging
  * updated logging path for generic imports
  * updated migration and schema imports of logging
  * updated tests and index logging import
  * 🔥 removed logging from common module
  * fixed tests
  • Loading branch information
vikaspotluri123 committed May 28, 2020
1 parent 9b9f846 commit 00c324f
Show file tree
Hide file tree
Showing 139 changed files with 177 additions and 153 deletions.
3 changes: 2 additions & 1 deletion core/frontend/apps/private-blogging/index.js
@@ -1,5 +1,6 @@
const {i18n} = require('../../../server/lib/common');
const urlUtils = require('../../../shared/url-utils');
const {logging, i18n} = require('../../../server/lib/common');
const logging = require('../../../shared/logging');
const errors = require('@tryghost/errors');
const middleware = require('./lib/middleware');
const router = require('./lib/router');
Expand Down
2 changes: 1 addition & 1 deletion core/frontend/meta/index.js
@@ -1,7 +1,7 @@
const Promise = require('bluebird');
const settingsCache = require('../../server/services/settings/cache');
const urlUtils = require('../../shared/url-utils');
const {logging} = require('../../server/lib/common');
const logging = require('../../shared/logging');
const getUrl = require('./url');
const getImageDimensions = require('./image-dimensions');
const getCanonicalUrl = require('./canonical_url');
Expand Down
3 changes: 2 additions & 1 deletion core/frontend/services/apps/index.js
@@ -1,6 +1,7 @@
const debug = require('ghost-ignition').debug('services:apps');
const Promise = require('bluebird');
const {logging, i18n} = require('../../../server/lib/common');
const {i18n} = require('../../../server/lib/common');
const logging = require('../../../shared/logging');
const errors = require('@tryghost/errors');
const config = require('../../../shared/config');
const loader = require('./loader');
Expand Down
3 changes: 2 additions & 1 deletion core/frontend/services/proxy.js
Expand Up @@ -4,7 +4,8 @@
const hbs = require('./themes/engine');
const errors = require('@tryghost/errors');

const {i18n, logging} = require('../../server/lib/common');
const {i18n} = require('../../server/lib/common');
const logging = require('../../shared/logging');
const settingsCache = require('../../server/services/settings/cache');
const config = require('../../shared/config');

Expand Down
3 changes: 2 additions & 1 deletion core/frontend/services/themes/activate.js
@@ -1,4 +1,5 @@
const {events, logging, i18n} = require('../../../server/lib/common');
const {events, i18n} = require('../../../server/lib/common');
const logging = require('../../../shared/logging');
const errors = require('@tryghost/errors');
const active = require('./active');

Expand Down
2 changes: 1 addition & 1 deletion core/frontend/services/themes/handlebars/register.js
Expand Up @@ -2,7 +2,7 @@ const Promise = require('bluebird');
const errors = require('@tryghost/errors');
const hbs = require('../engine');
const config = require('../../../../shared/config');
const {logging} = require('../../../../server/lib/common');
const logging = require('../../../../shared/logging');

// Register an async handlebars helper for a given handlebars instance
function asyncHelperWrapper(hbs, name, fn) {
Expand Down
3 changes: 2 additions & 1 deletion core/frontend/services/themes/i18n.js
@@ -1,5 +1,6 @@
const errors = require('@tryghost/errors');
const {i18n, events, logging} = require('../../../server/lib/common');
const {i18n, events} = require('../../../server/lib/common');
const logging = require('../../../shared/logging');
const settingsCache = require('../../../server/services/settings/cache');
const config = require('../../../shared/config');

Expand Down
3 changes: 2 additions & 1 deletion core/frontend/services/themes/index.js
@@ -1,6 +1,7 @@
const _ = require('lodash');
const debug = require('ghost-ignition').debug('themes');
const {events, i18n: commonI18n, logging} = require('../../../server/lib/common');
const {events, i18n: commonI18n} = require('../../../server/lib/common');
const logging = require('../../../shared/logging');
const errors = require('@tryghost/errors');
const themeLoader = require('./loader');
const active = require('./active');
Expand Down
3 changes: 2 additions & 1 deletion core/frontend/services/themes/storage.js
Expand Up @@ -8,7 +8,8 @@ const themeLoader = require('./loader');
const toJSON = require('./to-json');

const settingsCache = require('../../../server/services/settings/cache');
const {i18n, logging} = require('../../../server/lib/common');
const {i18n} = require('../../../server/lib/common');
const logging = require('../../../shared/logging');
const errors = require('@tryghost/errors');
const debug = require('ghost-ignition').debug('api:themes');

Expand Down
2 changes: 1 addition & 1 deletion core/frontend/services/url/Queue.js
@@ -1,7 +1,7 @@
const debug = require('ghost-ignition').debug('services:url:queue');
const EventEmitter = require('events').EventEmitter;
const _ = require('lodash');
const {logging} = require('../../../server/lib/common');
const logging = require('../../../shared/logging');
const errors = require('@tryghost/errors');

/**
Expand Down
2 changes: 1 addition & 1 deletion core/frontend/services/url/Resource.js
@@ -1,5 +1,5 @@
const EventEmitter = require('events').EventEmitter;
const {logging} = require('../../../server/lib/common');
const logging = require('../../../shared/logging');
const errors = require('@tryghost/errors');

/**
Expand Down
3 changes: 2 additions & 1 deletion core/frontend/services/url/Urls.js
@@ -1,7 +1,8 @@
const _ = require('lodash');
const debug = require('ghost-ignition').debug('services:url:urls');
const {events} = require('../../../server/lib/common');
const urlUtils = require('../../../shared/url-utils');
const {logging, events} = require('../../../server/lib/common');
const logging = require('../../../shared/logging');
const errors = require('@tryghost/errors');

/**
Expand Down
2 changes: 1 addition & 1 deletion core/server/adapters/scheduling/SchedulingDefault.js
Expand Up @@ -2,7 +2,7 @@ const util = require('util');
const moment = require('moment');
const debug = require('ghost-ignition').debug('scheduling-default');
const SchedulingBase = require('./SchedulingBase');
const {logging} = require('../../lib/common');
const logging = require('../../../shared/logging');
const errors = require('@tryghost/errors');
const request = require('../../lib/request');

Expand Down
3 changes: 2 additions & 1 deletion core/server/adapters/storage/LocalFileStorage.js
Expand Up @@ -7,7 +7,8 @@ const path = require('path');
const Promise = require('bluebird');
const moment = require('moment');
const config = require('../../../shared/config');
const {logging, i18n} = require('../../lib/common');
const {i18n} = require('../../lib/common');
const logging = require('../../../shared/logging');
const errors = require('@tryghost/errors');
const constants = require('../../lib/constants');
const urlUtils = require('../../../shared/url-utils');
Expand Down
3 changes: 2 additions & 1 deletion core/server/api/canary/invites.js
@@ -1,5 +1,6 @@
const Promise = require('bluebird');
const {i18n, logging} = require('../../lib/common');
const {i18n} = require('../../lib/common');
const logging = require('../../../shared/logging');
const errors = require('@tryghost/errors');
const security = require('../../lib/security');
const mailService = require('../../services/mail');
Expand Down
3 changes: 2 additions & 1 deletion core/server/api/canary/members.js
Expand Up @@ -7,7 +7,8 @@ const config = require('../../../shared/config');
const models = require('../../models');
const membersService = require('../../services/members');
const settingsCache = require('../../services/settings/cache');
const {i18n, logging} = require('../../lib/common');
const {i18n} = require('../../lib/common');
const logging = require('../../../shared/logging');
const fsLib = require('../../lib/fs');
const db = require('../../data/db');
const _ = require('lodash');
Expand Down
3 changes: 2 additions & 1 deletion core/server/api/v2/invites.js
@@ -1,5 +1,6 @@
const Promise = require('bluebird');
const {i18n, logging} = require('../../lib/common');
const {i18n} = require('../../lib/common');
const logging = require('../../../shared/logging');
const errors = require('@tryghost/errors');
const security = require('../../lib/security');
const mailService = require('../../services/mail');
Expand Down
2 changes: 1 addition & 1 deletion core/server/data/db/backup.js
Expand Up @@ -5,7 +5,7 @@ const fs = require('fs-extra');
const path = require('path');
const Promise = require('bluebird');
const config = require('../../../shared/config');
const {logging} = require('../../lib/common');
const logging = require('../../../shared/logging');
const urlUtils = require('../../../shared/url-utils');
const exporter = require('../exporter');
let writeExportFile;
Expand Down
2 changes: 1 addition & 1 deletion core/server/data/db/connection.js
@@ -1,6 +1,6 @@
const knex = require('knex');
const config = require('../../../shared/config');
const {logging} = require('../../lib/common');
const logging = require('../../../shared/logging');
const errors = require('@tryghost/errors');
let knexInstance;

Expand Down
3 changes: 2 additions & 1 deletion core/server/data/exporter/index.js
Expand Up @@ -3,7 +3,8 @@ const Promise = require('bluebird');
const db = require('../../data/db');
const commands = require('../schema').commands;
const ghostVersion = require('../../lib/ghost-version');
const {logging, i18n} = require('../../lib/common');
const {i18n} = require('../../lib/common');
const logging = require('../../../shared/logging');
const errors = require('@tryghost/errors');
const security = require('../../lib/security');
const models = require('../../models');
Expand Down
3 changes: 2 additions & 1 deletion core/server/data/importer/index.js
Expand Up @@ -8,7 +8,8 @@ const uuid = require('uuid');
const {extract} = require('@tryghost/zip');
const sequence = require('../../lib/promise/sequence');
const pipeline = require('../../lib/promise/pipeline');
const {logging, i18n} = require('../../lib/common');
const {i18n} = require('../../lib/common');
const logging = require('../../../shared/logging');
const errors = require('@tryghost/errors');
const ImageHandler = require('./handlers/image');
const JSONHandler = require('./handlers/json');
Expand Down
2 changes: 1 addition & 1 deletion core/server/data/migrations/init/1-create-tables.js
@@ -1,7 +1,7 @@
const Promise = require('bluebird');
const commands = require('../../schema').commands;
const schema = require('../../schema').tables;
const {logging} = require('../../../lib/common');
const logging = require('../../../../shared/logging');
const schemaTables = Object.keys(schema);

module.exports.up = function createTables(options) {
Expand Down
2 changes: 1 addition & 1 deletion core/server/data/migrations/init/2-create-fixtures.js
@@ -1,7 +1,7 @@
const Promise = require('bluebird');
const _ = require('lodash');
const fixtures = require('../../schema/fixtures');
const {logging} = require('../../../lib/common');
const logging = require('../../../../shared/logging');

module.exports.config = {
transaction: true
Expand Down
@@ -1,5 +1,5 @@
const Promise = require('bluebird');
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');
const commands = require('../../../schema').commands;
const table = 'posts';
const columns = ['custom_template'];
Expand Down
@@ -1,7 +1,7 @@
const _ = require('lodash');
const utils = require('../../../schema/fixtures/utils');
const permissions = require('../../../../services/permissions');
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');
const resource = 'theme';
const _private = {};

Expand Down
@@ -1,5 +1,5 @@
const Promise = require('bluebird');
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');
const commands = require('../../../schema').commands;
const table = 'webhooks';
const message1 = 'Adding table: ' + table;
Expand Down
@@ -1,7 +1,7 @@
const _ = require('lodash');
const utils = require('../../../schema/fixtures/utils');
const permissions = require('../../../../services/permissions');
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');
const resource = 'webhook';
const _private = {};

Expand Down
@@ -1,6 +1,6 @@
const _ = require('lodash');
const models = require('../../../../models');
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');

module.exports.config = {
transaction: true
Expand Down
Expand Up @@ -2,7 +2,7 @@ const merge = require('lodash/merge');
const utils = require('../../../schema/fixtures/utils');
const models = require('../../../../models');
const permissions = require('../../../../services/permissions');
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');
const _private = {};

_private.addRole = function addRole(options) {
Expand Down
@@ -1,5 +1,5 @@
const Promise = require('bluebird');
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');
const commands = require('../../../schema').commands;
const table = 'posts_authors';
const message1 = 'Adding table: ' + table;
Expand Down
@@ -1,7 +1,7 @@
const _ = require('lodash');
const Promise = require('bluebird');
const ObjectId = require('bson-objectid');
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');
const models = require('../../../../models');

module.exports.config = {
Expand Down
@@ -1,6 +1,6 @@
const _ = require('lodash');
const Promise = require('bluebird');
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');
const mobiledocLib = require('../../../../lib/mobiledoc');
const models = require('../../../../models');
const message1 = 'Migrating Koenig beta post\'s mobiledoc/HTML to 2.0 format';
Expand Down
2 changes: 1 addition & 1 deletion core/server/data/migrations/versions/1.25/2-demo-post.js
@@ -1,5 +1,5 @@
const _ = require('lodash');
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');
const models = require('../../../../models');
const fixtures = require('../../../../data/schema/fixtures');
const message1 = 'Adding demo post.';
Expand Down
2 changes: 1 addition & 1 deletion core/server/data/migrations/versions/1.3/1-post-excerpt.js
@@ -1,5 +1,5 @@
const Promise = require('bluebird');
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');
const commands = require('../../../schema').commands;
const table = 'posts';
const columns = ['custom_excerpt'];
Expand Down
@@ -1,5 +1,5 @@
const Promise = require('bluebird');
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');
const commands = require('../../../schema').commands;
const table = 'posts';
const columns = ['codeinjection_head', 'codeinjection_foot'];
Expand Down
@@ -1,5 +1,5 @@
const Promise = require('bluebird');
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');
const commands = require('../../../schema').commands;
const table = 'posts';
const columns = ['og_image', 'og_title', 'og_description', 'twitter_image', 'twitter_title', 'twitter_description'];
Expand Down
@@ -1,7 +1,7 @@
const _ = require('lodash');
const utils = require('../../../schema/fixtures/utils');
const permissions = require('../../../../services/permissions');
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');
const resource = 'redirect';
const _private = {};

Expand Down
@@ -1,4 +1,4 @@
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');
const table = 'posts';
const columnNameOld = 'amp';
const columnNameNew = 'comment_id';
Expand Down
2 changes: 1 addition & 1 deletion core/server/data/migrations/versions/2.0/2-update-posts.js
@@ -1,6 +1,6 @@
const _ = require('lodash');
const Promise = require('bluebird');
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');
const mobiledocLib = require('../../../../lib/mobiledoc');
const message1 = 'Updating posts: apply new editor format and set comment_id field.';
const message2 = 'Updated posts: apply new editor format and set comment_id field.';
Expand Down
@@ -1,6 +1,6 @@
const _ = require('lodash');
const Promise = require('bluebird');
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');
const models = require('../../../../models');
const message1 = 'Removing `koenigEditor` from labs.';
const message2 = 'Removed `koenigEditor` from labs.';
Expand Down
@@ -1,7 +1,7 @@
const path = require('path');
const fs = require('fs-extra');
const config = require('../../../../../shared/config');
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');
const models = require('../../../../models');
const message1 = 'Removing `globals.permalinks` from routes.yaml.';
const message2 = 'Removed `globals.permalinks` from routes.yaml.';
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

@@ -1,4 +1,4 @@
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');
const commands = require('../../../schema').commands;
const table = 'actions';
const message1 = `Adding table: ${table}`;
Expand Down
@@ -1,7 +1,7 @@
const _ = require('lodash');
const utils = require('../../../schema/fixtures/utils');
const permissions = require('../../../../services/permissions');
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');
const resource = 'action';
const _private = {};

Expand Down
@@ -1,4 +1,4 @@
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');
const commands = require('../../../schema').commands;
const table = 'integrations';
const newColumnNames = [
Expand Down
@@ -1,4 +1,4 @@
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');
const merge = require('lodash/merge');
const models = require('../../../../models');
const utils = require('../../../schema/fixtures/utils');
Expand Down
@@ -1,6 +1,6 @@
const _ = require('lodash');
const Promise = require('bluebird');
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');

module.exports.config = {
transaction: true
Expand Down
@@ -1,5 +1,5 @@
const Promise = require('bluebird');
const {logging} = require('../../../../lib/common');
const logging = require('../../../../../shared/logging');
const commands = require('../../../schema').commands;
const table = 'posts';
const columns = ['canonical_url'];
Expand Down

0 comments on commit 00c324f

Please sign in to comment.