From 00c324fa4ea382f9aa391431fb0cc52b9f32fa9d Mon Sep 17 00:00:00 2001 From: Vikas Potluri Date: Thu, 28 May 2020 13:30:23 -0500 Subject: [PATCH] Moved core/server/lib/common/logging to core/shared/logging (#11857) - 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 * :fire: removed logging from common module * fixed tests --- core/frontend/apps/private-blogging/index.js | 3 ++- core/frontend/meta/index.js | 2 +- core/frontend/services/apps/index.js | 3 ++- core/frontend/services/proxy.js | 3 ++- core/frontend/services/themes/activate.js | 3 ++- .../services/themes/handlebars/register.js | 2 +- core/frontend/services/themes/i18n.js | 3 ++- core/frontend/services/themes/index.js | 3 ++- core/frontend/services/themes/storage.js | 3 ++- core/frontend/services/url/Queue.js | 2 +- core/frontend/services/url/Resource.js | 2 +- core/frontend/services/url/Urls.js | 3 ++- .../adapters/scheduling/SchedulingDefault.js | 2 +- core/server/adapters/storage/LocalFileStorage.js | 3 ++- core/server/api/canary/invites.js | 3 ++- core/server/api/canary/members.js | 3 ++- core/server/api/v2/invites.js | 3 ++- core/server/data/db/backup.js | 2 +- core/server/data/db/connection.js | 2 +- core/server/data/exporter/index.js | 3 ++- core/server/data/importer/index.js | 3 ++- .../data/migrations/init/1-create-tables.js | 2 +- .../data/migrations/init/2-create-fixtures.js | 2 +- .../versions/1.13/1-custom-template-post.js | 2 +- .../versions/1.13/2-theme-permissions.js | 2 +- .../versions/1.18/1-add-webhooks-table.js | 2 +- .../versions/1.19/1-webhook-permissions.js | 2 +- .../versions/1.20/1-remove-settings-keys.js | 2 +- .../versions/1.21/1-add-contributor-role.js | 2 +- .../versions/1.22/1-multiple-authors-DDL.js | 2 +- .../versions/1.22/1-multiple-authors-DML.js | 2 +- .../versions/1.25/1-update-koenig-beta-html.js | 2 +- .../data/migrations/versions/1.25/2-demo-post.js | 2 +- .../migrations/versions/1.3/1-post-excerpt.js | 2 +- .../versions/1.4/1-codeinjection-post.js | 2 +- .../migrations/versions/1.5/1-og-twitter-post.js | 2 +- .../versions/1.9/1-add-permissions-redirect.js | 2 +- .../versions/2.0/1-rename-amp-column.js | 2 +- .../migrations/versions/2.0/2-update-posts.js | 2 +- .../versions/2.0/3-remove-koenig-labs.js | 2 +- .../versions/2.0/4-permalink-setting.js | 2 +- .../migrations/versions/2.0/5-remove-demo-post.js | 2 +- .../versions/2.14/1-add-actions-table.js | 2 +- .../versions/2.14/2-add-actions-permissions.js | 2 +- .../2.15/1-add-type-column-to-integrations.js | 2 +- .../versions/2.15/2-insert-zapier-integration.js | 2 +- .../versions/2.17/1-normalize-settings.js | 2 +- .../versions/2.17/2-posts-add-canonical-url.js | 2 +- .../2.18/1-restore-settings-from-backup.js | 2 +- .../versions/2.2/1-add-sessions-table.js | 2 +- .../2.2/2-add-integrations-and-api-key-tables.js | 2 +- .../2.2/3-insert-admin-integration-role.js | 2 +- ...-insert-integration-and-api-key-permissions.js | 2 +- .../2.2/5-add-mobiledoc-revisions-table.js | 2 +- .../versions/2.21/1-update-editor-permissions.js | 2 +- .../2.22/1-add-member-permissions-to-roles.js | 2 +- .../2.27/1-insert-ghost-db-backup-role.js | 2 +- .../2.27/2-insert-db-backup-integration.js | 2 +- ...add-subdirectory-to-relative-canonical-urls.js | 2 +- .../2.28/1-add-db-backup-content-permission.js | 2 +- ...2-add-db-backup-content-permission-to-roles.js | 2 +- .../2.28/3-insert-ghost-scheduler-role.js | 2 +- .../2.28/4-insert-scheduler-integration.js | 2 +- .../2.28/5-add-scheduler-permission-to-roles.js | 2 +- .../versions/2.29/1-add-post-page-column.js | 2 +- .../versions/2.29/2-populate-post-page-column.js | 2 +- .../versions/2.29/3-remove-page-type-column.js | 2 +- .../versions/2.3/1-add-webhook-columns.js | 2 +- .../versions/2.3/2-add-webhook-edit-permission.js | 2 +- .../01-correct-members-stripe-customers-table.js | 2 +- ...01-add-stripe-customers-subscriptions-table.js | 2 +- ...signup-and-from address-to-members-settings.js | 2 +- .../2.6/1-add-webhook-permission-roles.js | 2 +- .../versions/2.8/1-add-members-table.js | 2 +- .../3.0/01-remove-user-ghost-auth-columns.js | 2 +- .../versions/3.0/02-drop-token-auth-tables.js | 2 +- .../versions/3.0/03-drop-client-auth-tables.js | 2 +- .../versions/3.0/04-add-posts-meta-table.js | 2 +- .../versions/3.0/05-populate-posts-meta-table.js | 2 +- .../versions/3.0/07-add-posts-type-column.js | 2 +- .../versions/3.0/08-populate-posts-type-column.js | 2 +- .../versions/3.0/09-remove-posts-page-column.js | 2 +- .../versions/3.0/10-remove-empty-strings.js | 2 +- .../versions/3.0/11-update-posts-html.js | 2 +- .../12-populate-members-table-from-subscribers.js | 2 +- .../versions/3.0/13-drop-subscribers-table.js | 2 +- .../versions/3.0/14-remove-subscribers-flag.js | 2 +- .../3.1/03-add-email-preview-permissions.js | 2 +- .../3.1/04-add-subscribed-flag-to-members.js | 2 +- .../versions/3.1/05-add-emails-table.js | 2 +- .../versions/3.1/06-add-email-permissions.js | 2 +- .../versions/3.1/07-add-uuid-field-to-members.js | 2 +- .../versions/3.1/08-add-uuid-values-to-members.js | 2 +- .../3.1/09-add-further-email-permissions.js | 2 +- ...en-complimentary-plan-from-members-settings.js | 2 +- .../versions/3.12/01-add-identity-permission.js | 2 +- ...02-remove-legacy-is-paid-flag-from-settings.js | 2 +- .../migrations/versions/3.6/1-add-labels-table.js | 2 +- .../versions/3.6/2-add-members-labels-table.js | 2 +- .../versions/3.6/3-add-labels-permissions.js | 2 +- ...01-fix-incorrect-member-labels-foreign-keys.js | 2 +- .../3.9/01-add-member-sigin-url-permissions.js | 2 +- core/server/data/schema/commands.js | 3 ++- core/server/data/schema/fixtures/utils.js | 2 +- core/server/ghost-server.js | 3 ++- core/server/index.js | 3 ++- core/server/lib/common/index.js | 4 ---- .../lib/image/cached-image-size-from-url.js | 2 +- core/server/lib/mobiledoc.js | 2 +- core/server/models/api-key.js | 2 +- core/server/models/base/index.js | 3 ++- core/server/models/base/listeners.js | 3 ++- core/server/services/auth/setup.js | 3 ++- core/server/services/bulk-email/index.js | 3 ++- core/server/services/bulk-email/mailgun.js | 2 +- core/server/services/labs.js | 3 ++- core/server/services/mega/mega.js | 3 ++- core/server/services/members/api.js | 2 +- core/server/services/members/config.js | 2 +- core/server/services/members/index.js | 3 ++- core/server/services/members/middleware.js | 2 +- core/server/services/slack.js | 3 ++- core/server/services/webhooks/trigger.js | 2 +- core/server/services/xmlrpc.js | 3 ++- core/server/update-check.js | 3 ++- core/server/web/admin/controller.js | 2 +- core/server/web/api/middleware/normalize-image.js | 2 +- core/server/web/api/middleware/upload.js | 3 ++- core/server/web/parent/middleware/log-request.js | 2 +- .../web/shared/middlewares/api/spam-prevention.js | 3 ++- .../web/shared/middlewares/custom-redirects.js | 3 ++- core/{server/lib/common => shared}/logging.js | 2 +- index.js | 2 +- test/unit/helpers/img_url_spec.js | 4 ++-- test/unit/helpers/is_spec.js | 5 ++--- test/unit/services/slack_spec.js | 3 ++- test/unit/services/url/Queue_spec.js | 3 +-- test/unit/services/xmlrpc_spec.js | 15 +++++++-------- .../web/api/middleware/normalize-image_spec.js | 2 +- 139 files changed, 177 insertions(+), 153 deletions(-) rename core/{server/lib/common => shared}/logging.js (90%) diff --git a/core/frontend/apps/private-blogging/index.js b/core/frontend/apps/private-blogging/index.js index a219abccf5..5e1ea94c57 100644 --- a/core/frontend/apps/private-blogging/index.js +++ b/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'); diff --git a/core/frontend/meta/index.js b/core/frontend/meta/index.js index 272adfdc90..981f7f4ec2 100644 --- a/core/frontend/meta/index.js +++ b/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'); diff --git a/core/frontend/services/apps/index.js b/core/frontend/services/apps/index.js index 657598e99b..a5f23b75b4 100644 --- a/core/frontend/services/apps/index.js +++ b/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'); diff --git a/core/frontend/services/proxy.js b/core/frontend/services/proxy.js index e8aa351e69..720ad17172 100644 --- a/core/frontend/services/proxy.js +++ b/core/frontend/services/proxy.js @@ -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'); diff --git a/core/frontend/services/themes/activate.js b/core/frontend/services/themes/activate.js index 54738f603c..82ac90e876 100644 --- a/core/frontend/services/themes/activate.js +++ b/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'); diff --git a/core/frontend/services/themes/handlebars/register.js b/core/frontend/services/themes/handlebars/register.js index 9eb0957fd9..36521ece1b 100644 --- a/core/frontend/services/themes/handlebars/register.js +++ b/core/frontend/services/themes/handlebars/register.js @@ -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) { diff --git a/core/frontend/services/themes/i18n.js b/core/frontend/services/themes/i18n.js index a98ed3b856..58099f70b3 100644 --- a/core/frontend/services/themes/i18n.js +++ b/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'); diff --git a/core/frontend/services/themes/index.js b/core/frontend/services/themes/index.js index 8a48629139..f296586ce2 100644 --- a/core/frontend/services/themes/index.js +++ b/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'); diff --git a/core/frontend/services/themes/storage.js b/core/frontend/services/themes/storage.js index d92d25f45b..1e7fd77429 100644 --- a/core/frontend/services/themes/storage.js +++ b/core/frontend/services/themes/storage.js @@ -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'); diff --git a/core/frontend/services/url/Queue.js b/core/frontend/services/url/Queue.js index d7962f8c54..cde9dc2348 100644 --- a/core/frontend/services/url/Queue.js +++ b/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'); /** diff --git a/core/frontend/services/url/Resource.js b/core/frontend/services/url/Resource.js index 753390ca11..a996f9a6e0 100644 --- a/core/frontend/services/url/Resource.js +++ b/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'); /** diff --git a/core/frontend/services/url/Urls.js b/core/frontend/services/url/Urls.js index efe205f127..2e24785c5c 100644 --- a/core/frontend/services/url/Urls.js +++ b/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'); /** diff --git a/core/server/adapters/scheduling/SchedulingDefault.js b/core/server/adapters/scheduling/SchedulingDefault.js index a4f433f0ad..a1305b1e17 100644 --- a/core/server/adapters/scheduling/SchedulingDefault.js +++ b/core/server/adapters/scheduling/SchedulingDefault.js @@ -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'); diff --git a/core/server/adapters/storage/LocalFileStorage.js b/core/server/adapters/storage/LocalFileStorage.js index 3ab0e7d661..a6797ac699 100644 --- a/core/server/adapters/storage/LocalFileStorage.js +++ b/core/server/adapters/storage/LocalFileStorage.js @@ -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'); diff --git a/core/server/api/canary/invites.js b/core/server/api/canary/invites.js index d62625cacf..19911af69e 100644 --- a/core/server/api/canary/invites.js +++ b/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'); diff --git a/core/server/api/canary/members.js b/core/server/api/canary/members.js index 8d8ef83eb0..a45217da03 100644 --- a/core/server/api/canary/members.js +++ b/core/server/api/canary/members.js @@ -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'); diff --git a/core/server/api/v2/invites.js b/core/server/api/v2/invites.js index d62625cacf..19911af69e 100644 --- a/core/server/api/v2/invites.js +++ b/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'); diff --git a/core/server/data/db/backup.js b/core/server/data/db/backup.js index c3101f99d0..308cfb4028 100644 --- a/core/server/data/db/backup.js +++ b/core/server/data/db/backup.js @@ -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; diff --git a/core/server/data/db/connection.js b/core/server/data/db/connection.js index 7c217f5445..8f082486ef 100644 --- a/core/server/data/db/connection.js +++ b/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; diff --git a/core/server/data/exporter/index.js b/core/server/data/exporter/index.js index fd236dff38..4a293ba313 100644 --- a/core/server/data/exporter/index.js +++ b/core/server/data/exporter/index.js @@ -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'); diff --git a/core/server/data/importer/index.js b/core/server/data/importer/index.js index 2dba35c682..a6449a860d 100644 --- a/core/server/data/importer/index.js +++ b/core/server/data/importer/index.js @@ -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'); diff --git a/core/server/data/migrations/init/1-create-tables.js b/core/server/data/migrations/init/1-create-tables.js index bdd088ea0a..d1e0f3c51a 100644 --- a/core/server/data/migrations/init/1-create-tables.js +++ b/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) { diff --git a/core/server/data/migrations/init/2-create-fixtures.js b/core/server/data/migrations/init/2-create-fixtures.js index c8ca42feb2..01ed45dc9a 100644 --- a/core/server/data/migrations/init/2-create-fixtures.js +++ b/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 diff --git a/core/server/data/migrations/versions/1.13/1-custom-template-post.js b/core/server/data/migrations/versions/1.13/1-custom-template-post.js index 7530a97961..f41ecd6eaa 100644 --- a/core/server/data/migrations/versions/1.13/1-custom-template-post.js +++ b/core/server/data/migrations/versions/1.13/1-custom-template-post.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_template']; diff --git a/core/server/data/migrations/versions/1.13/2-theme-permissions.js b/core/server/data/migrations/versions/1.13/2-theme-permissions.js index fa08f532d8..b035051dc4 100644 --- a/core/server/data/migrations/versions/1.13/2-theme-permissions.js +++ b/core/server/data/migrations/versions/1.13/2-theme-permissions.js @@ -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 = {}; diff --git a/core/server/data/migrations/versions/1.18/1-add-webhooks-table.js b/core/server/data/migrations/versions/1.18/1-add-webhooks-table.js index 5d23e626b1..a26ed305ad 100644 --- a/core/server/data/migrations/versions/1.18/1-add-webhooks-table.js +++ b/core/server/data/migrations/versions/1.18/1-add-webhooks-table.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 = 'webhooks'; const message1 = 'Adding table: ' + table; diff --git a/core/server/data/migrations/versions/1.19/1-webhook-permissions.js b/core/server/data/migrations/versions/1.19/1-webhook-permissions.js index 267c3c8111..bebe92d201 100644 --- a/core/server/data/migrations/versions/1.19/1-webhook-permissions.js +++ b/core/server/data/migrations/versions/1.19/1-webhook-permissions.js @@ -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 = {}; diff --git a/core/server/data/migrations/versions/1.20/1-remove-settings-keys.js b/core/server/data/migrations/versions/1.20/1-remove-settings-keys.js index 5e178448d9..715d5b7360 100644 --- a/core/server/data/migrations/versions/1.20/1-remove-settings-keys.js +++ b/core/server/data/migrations/versions/1.20/1-remove-settings-keys.js @@ -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 diff --git a/core/server/data/migrations/versions/1.21/1-add-contributor-role.js b/core/server/data/migrations/versions/1.21/1-add-contributor-role.js index f745da6963..7adc06e462 100644 --- a/core/server/data/migrations/versions/1.21/1-add-contributor-role.js +++ b/core/server/data/migrations/versions/1.21/1-add-contributor-role.js @@ -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) { diff --git a/core/server/data/migrations/versions/1.22/1-multiple-authors-DDL.js b/core/server/data/migrations/versions/1.22/1-multiple-authors-DDL.js index bfac5cc677..ba16cdabe7 100644 --- a/core/server/data/migrations/versions/1.22/1-multiple-authors-DDL.js +++ b/core/server/data/migrations/versions/1.22/1-multiple-authors-DDL.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_authors'; const message1 = 'Adding table: ' + table; diff --git a/core/server/data/migrations/versions/1.22/1-multiple-authors-DML.js b/core/server/data/migrations/versions/1.22/1-multiple-authors-DML.js index 02c1fbaf15..c63fe1c8b7 100644 --- a/core/server/data/migrations/versions/1.22/1-multiple-authors-DML.js +++ b/core/server/data/migrations/versions/1.22/1-multiple-authors-DML.js @@ -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 = { diff --git a/core/server/data/migrations/versions/1.25/1-update-koenig-beta-html.js b/core/server/data/migrations/versions/1.25/1-update-koenig-beta-html.js index 9492c90c84..f3f341cfa8 100644 --- a/core/server/data/migrations/versions/1.25/1-update-koenig-beta-html.js +++ b/core/server/data/migrations/versions/1.25/1-update-koenig-beta-html.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 models = require('../../../../models'); const message1 = 'Migrating Koenig beta post\'s mobiledoc/HTML to 2.0 format'; diff --git a/core/server/data/migrations/versions/1.25/2-demo-post.js b/core/server/data/migrations/versions/1.25/2-demo-post.js index dd6626f040..6ff1e27218 100644 --- a/core/server/data/migrations/versions/1.25/2-demo-post.js +++ b/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.'; diff --git a/core/server/data/migrations/versions/1.3/1-post-excerpt.js b/core/server/data/migrations/versions/1.3/1-post-excerpt.js index 3f08c061cc..7c7e4727a3 100644 --- a/core/server/data/migrations/versions/1.3/1-post-excerpt.js +++ b/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']; diff --git a/core/server/data/migrations/versions/1.4/1-codeinjection-post.js b/core/server/data/migrations/versions/1.4/1-codeinjection-post.js index fba4ac4dde..0d17b908d1 100644 --- a/core/server/data/migrations/versions/1.4/1-codeinjection-post.js +++ b/core/server/data/migrations/versions/1.4/1-codeinjection-post.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 = ['codeinjection_head', 'codeinjection_foot']; diff --git a/core/server/data/migrations/versions/1.5/1-og-twitter-post.js b/core/server/data/migrations/versions/1.5/1-og-twitter-post.js index 925c096266..d4e96e7e26 100644 --- a/core/server/data/migrations/versions/1.5/1-og-twitter-post.js +++ b/core/server/data/migrations/versions/1.5/1-og-twitter-post.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 = ['og_image', 'og_title', 'og_description', 'twitter_image', 'twitter_title', 'twitter_description']; diff --git a/core/server/data/migrations/versions/1.9/1-add-permissions-redirect.js b/core/server/data/migrations/versions/1.9/1-add-permissions-redirect.js index 200c5d5a3f..1fcf9bf55b 100644 --- a/core/server/data/migrations/versions/1.9/1-add-permissions-redirect.js +++ b/core/server/data/migrations/versions/1.9/1-add-permissions-redirect.js @@ -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 = {}; diff --git a/core/server/data/migrations/versions/2.0/1-rename-amp-column.js b/core/server/data/migrations/versions/2.0/1-rename-amp-column.js index 3fd1f4a6a8..14939ea4df 100644 --- a/core/server/data/migrations/versions/2.0/1-rename-amp-column.js +++ b/core/server/data/migrations/versions/2.0/1-rename-amp-column.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const table = 'posts'; const columnNameOld = 'amp'; const columnNameNew = 'comment_id'; diff --git a/core/server/data/migrations/versions/2.0/2-update-posts.js b/core/server/data/migrations/versions/2.0/2-update-posts.js index c4b717c94e..f0adafd710 100644 --- a/core/server/data/migrations/versions/2.0/2-update-posts.js +++ b/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.'; diff --git a/core/server/data/migrations/versions/2.0/3-remove-koenig-labs.js b/core/server/data/migrations/versions/2.0/3-remove-koenig-labs.js index f12f95bb20..93f0e3ab78 100644 --- a/core/server/data/migrations/versions/2.0/3-remove-koenig-labs.js +++ b/core/server/data/migrations/versions/2.0/3-remove-koenig-labs.js @@ -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.'; diff --git a/core/server/data/migrations/versions/2.0/4-permalink-setting.js b/core/server/data/migrations/versions/2.0/4-permalink-setting.js index cc94641a3a..0731cfd3ff 100644 --- a/core/server/data/migrations/versions/2.0/4-permalink-setting.js +++ b/core/server/data/migrations/versions/2.0/4-permalink-setting.js @@ -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.'; diff --git a/core/server/data/migrations/versions/2.0/5-remove-demo-post.js b/core/server/data/migrations/versions/2.0/5-remove-demo-post.js index a2fd538ec2..498f97f158 100644 --- a/core/server/data/migrations/versions/2.0/5-remove-demo-post.js +++ b/core/server/data/migrations/versions/2.0/5-remove-demo-post.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const message1 = 'Removing demo post.'; const message2 = 'Removed demo post.'; const message3 = 'Rollback: Bring back demo post.'; diff --git a/core/server/data/migrations/versions/2.14/1-add-actions-table.js b/core/server/data/migrations/versions/2.14/1-add-actions-table.js index db0c70c3f1..71c3761280 100644 --- a/core/server/data/migrations/versions/2.14/1-add-actions-table.js +++ b/core/server/data/migrations/versions/2.14/1-add-actions-table.js @@ -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}`; diff --git a/core/server/data/migrations/versions/2.14/2-add-actions-permissions.js b/core/server/data/migrations/versions/2.14/2-add-actions-permissions.js index c5d7efc253..33ec0ca946 100644 --- a/core/server/data/migrations/versions/2.14/2-add-actions-permissions.js +++ b/core/server/data/migrations/versions/2.14/2-add-actions-permissions.js @@ -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 = {}; diff --git a/core/server/data/migrations/versions/2.15/1-add-type-column-to-integrations.js b/core/server/data/migrations/versions/2.15/1-add-type-column-to-integrations.js index d58b00ad90..fa40a6d8f5 100644 --- a/core/server/data/migrations/versions/2.15/1-add-type-column-to-integrations.js +++ b/core/server/data/migrations/versions/2.15/1-add-type-column-to-integrations.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const commands = require('../../../schema').commands; const table = 'integrations'; const newColumnNames = [ diff --git a/core/server/data/migrations/versions/2.15/2-insert-zapier-integration.js b/core/server/data/migrations/versions/2.15/2-insert-zapier-integration.js index 14adfb9860..e75f7e5a33 100644 --- a/core/server/data/migrations/versions/2.15/2-insert-zapier-integration.js +++ b/core/server/data/migrations/versions/2.15/2-insert-zapier-integration.js @@ -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'); diff --git a/core/server/data/migrations/versions/2.17/1-normalize-settings.js b/core/server/data/migrations/versions/2.17/1-normalize-settings.js index c3545039c6..b84467e644 100644 --- a/core/server/data/migrations/versions/2.17/1-normalize-settings.js +++ b/core/server/data/migrations/versions/2.17/1-normalize-settings.js @@ -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 diff --git a/core/server/data/migrations/versions/2.17/2-posts-add-canonical-url.js b/core/server/data/migrations/versions/2.17/2-posts-add-canonical-url.js index eb687ebd55..dff3ccf41e 100644 --- a/core/server/data/migrations/versions/2.17/2-posts-add-canonical-url.js +++ b/core/server/data/migrations/versions/2.17/2-posts-add-canonical-url.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 = ['canonical_url']; diff --git a/core/server/data/migrations/versions/2.18/1-restore-settings-from-backup.js b/core/server/data/migrations/versions/2.18/1-restore-settings-from-backup.js index 4f7dbafcd6..0a399f312c 100644 --- a/core/server/data/migrations/versions/2.18/1-restore-settings-from-backup.js +++ b/core/server/data/migrations/versions/2.18/1-restore-settings-from-backup.js @@ -1,6 +1,6 @@ const _ = require('lodash'); const Promise = require('bluebird'); -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const settingsCache = require('../../../../services/settings/cache'); const config = require('../../../../../shared/config'); const moment = require('moment'); diff --git a/core/server/data/migrations/versions/2.2/1-add-sessions-table.js b/core/server/data/migrations/versions/2.2/1-add-sessions-table.js index db5297a086..216f847b69 100644 --- a/core/server/data/migrations/versions/2.2/1-add-sessions-table.js +++ b/core/server/data/migrations/versions/2.2/1-add-sessions-table.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const commands = require('../../../schema').commands; const table = 'sessions'; const message1 = 'Adding table: ' + table; diff --git a/core/server/data/migrations/versions/2.2/2-add-integrations-and-api-key-tables.js b/core/server/data/migrations/versions/2.2/2-add-integrations-and-api-key-tables.js index 6af286f70b..694268caa6 100644 --- a/core/server/data/migrations/versions/2.2/2-add-integrations-and-api-key-tables.js +++ b/core/server/data/migrations/versions/2.2/2-add-integrations-and-api-key-tables.js @@ -1,5 +1,5 @@ const commands = require('../../../schema').commands; -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const tables = ['integrations', 'api_keys']; const _private = {}; diff --git a/core/server/data/migrations/versions/2.2/3-insert-admin-integration-role.js b/core/server/data/migrations/versions/2.2/3-insert-admin-integration-role.js index 8e411fddf4..376d62eea2 100644 --- a/core/server/data/migrations/versions/2.2/3-insert-admin-integration-role.js +++ b/core/server/data/migrations/versions/2.2/3-insert-admin-integration-role.js @@ -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'); diff --git a/core/server/data/migrations/versions/2.2/4-insert-integration-and-api-key-permissions.js b/core/server/data/migrations/versions/2.2/4-insert-integration-and-api-key-permissions.js index da14fc6a18..0651853332 100644 --- a/core/server/data/migrations/versions/2.2/4-insert-integration-and-api-key-permissions.js +++ b/core/server/data/migrations/versions/2.2/4-insert-integration-and-api-key-permissions.js @@ -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 resources = ['integration', 'api_key']; const _private = {}; diff --git a/core/server/data/migrations/versions/2.2/5-add-mobiledoc-revisions-table.js b/core/server/data/migrations/versions/2.2/5-add-mobiledoc-revisions-table.js index 0f2b553c42..b075b54632 100644 --- a/core/server/data/migrations/versions/2.2/5-add-mobiledoc-revisions-table.js +++ b/core/server/data/migrations/versions/2.2/5-add-mobiledoc-revisions-table.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const commands = require('../../../schema').commands; const table = 'mobiledoc_revisions'; const message1 = 'Adding table: ' + table; diff --git a/core/server/data/migrations/versions/2.21/1-update-editor-permissions.js b/core/server/data/migrations/versions/2.21/1-update-editor-permissions.js index fe2fe5e629..512d55c84a 100644 --- a/core/server/data/migrations/versions/2.21/1-update-editor-permissions.js +++ b/core/server/data/migrations/versions/2.21/1-update-editor-permissions.js @@ -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 resources = ['notification']; diff --git a/core/server/data/migrations/versions/2.22/1-add-member-permissions-to-roles.js b/core/server/data/migrations/versions/2.22/1-add-member-permissions-to-roles.js index 9bccc02dfc..1a9ce79fdb 100644 --- a/core/server/data/migrations/versions/2.22/1-add-member-permissions-to-roles.js +++ b/core/server/data/migrations/versions/2.22/1-add-member-permissions-to-roles.js @@ -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 = 'member'; const _private = {}; diff --git a/core/server/data/migrations/versions/2.27/1-insert-ghost-db-backup-role.js b/core/server/data/migrations/versions/2.27/1-insert-ghost-db-backup-role.js index 32382a695c..ba63611121 100644 --- a/core/server/data/migrations/versions/2.27/1-insert-ghost-db-backup-role.js +++ b/core/server/data/migrations/versions/2.27/1-insert-ghost-db-backup-role.js @@ -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'); diff --git a/core/server/data/migrations/versions/2.27/2-insert-db-backup-integration.js b/core/server/data/migrations/versions/2.27/2-insert-db-backup-integration.js index a803057daa..974ed6656c 100644 --- a/core/server/data/migrations/versions/2.27/2-insert-db-backup-integration.js +++ b/core/server/data/migrations/versions/2.27/2-insert-db-backup-integration.js @@ -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'); diff --git a/core/server/data/migrations/versions/2.27/3-add-subdirectory-to-relative-canonical-urls.js b/core/server/data/migrations/versions/2.27/3-add-subdirectory-to-relative-canonical-urls.js index df3ff33b02..75dc61a0eb 100644 --- a/core/server/data/migrations/versions/2.27/3-add-subdirectory-to-relative-canonical-urls.js +++ b/core/server/data/migrations/versions/2.27/3-add-subdirectory-to-relative-canonical-urls.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const config = require('../../../../../shared/config'); const {URL} = require('url'); diff --git a/core/server/data/migrations/versions/2.28/1-add-db-backup-content-permission.js b/core/server/data/migrations/versions/2.28/1-add-db-backup-content-permission.js index c7005cc212..f7d9975c2d 100644 --- a/core/server/data/migrations/versions/2.28/1-add-db-backup-content-permission.js +++ b/core/server/data/migrations/versions/2.28/1-add-db-backup-content-permission.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const models = require('../../../../models'); const utils = require('../../../schema/fixtures/utils'); diff --git a/core/server/data/migrations/versions/2.28/2-add-db-backup-content-permission-to-roles.js b/core/server/data/migrations/versions/2.28/2-add-db-backup-content-permission-to-roles.js index d9828fd2fe..d4be15e2ba 100644 --- a/core/server/data/migrations/versions/2.28/2-add-db-backup-content-permission-to-roles.js +++ b/core/server/data/migrations/versions/2.28/2-add-db-backup-content-permission-to-roles.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const utils = require('../../../schema/fixtures/utils'); const relationFixtures = { diff --git a/core/server/data/migrations/versions/2.28/3-insert-ghost-scheduler-role.js b/core/server/data/migrations/versions/2.28/3-insert-ghost-scheduler-role.js index f21a249540..254b074ada 100644 --- a/core/server/data/migrations/versions/2.28/3-insert-ghost-scheduler-role.js +++ b/core/server/data/migrations/versions/2.28/3-insert-ghost-scheduler-role.js @@ -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'); diff --git a/core/server/data/migrations/versions/2.28/4-insert-scheduler-integration.js b/core/server/data/migrations/versions/2.28/4-insert-scheduler-integration.js index 64106d39e6..4c0a764c20 100644 --- a/core/server/data/migrations/versions/2.28/4-insert-scheduler-integration.js +++ b/core/server/data/migrations/versions/2.28/4-insert-scheduler-integration.js @@ -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'); diff --git a/core/server/data/migrations/versions/2.28/5-add-scheduler-permission-to-roles.js b/core/server/data/migrations/versions/2.28/5-add-scheduler-permission-to-roles.js index 7b523d1c5b..2d733ae9d9 100644 --- a/core/server/data/migrations/versions/2.28/5-add-scheduler-permission-to-roles.js +++ b/core/server/data/migrations/versions/2.28/5-add-scheduler-permission-to-roles.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const utils = require('../../../schema/fixtures/utils'); const relationFixtures = { diff --git a/core/server/data/migrations/versions/2.29/1-add-post-page-column.js b/core/server/data/migrations/versions/2.29/1-add-post-page-column.js index 201b91afcc..f89f51406c 100644 --- a/core/server/data/migrations/versions/2.29/1-add-post-page-column.js +++ b/core/server/data/migrations/versions/2.29/1-add-post-page-column.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const commands = require('../../../schema').commands; const createLog = type => msg => logging[type](msg); diff --git a/core/server/data/migrations/versions/2.29/2-populate-post-page-column.js b/core/server/data/migrations/versions/2.29/2-populate-post-page-column.js index 85d672e0bb..2e2f642d33 100644 --- a/core/server/data/migrations/versions/2.29/2-populate-post-page-column.js +++ b/core/server/data/migrations/versions/2.29/2-populate-post-page-column.js @@ -1,5 +1,5 @@ const toPairs = require('lodash/toPairs'); -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); /* * @param from: object with a SINGLE entry { 'fromColumn': 'fromValue' } diff --git a/core/server/data/migrations/versions/2.29/3-remove-page-type-column.js b/core/server/data/migrations/versions/2.29/3-remove-page-type-column.js index 58ad31aa88..9ff601789b 100644 --- a/core/server/data/migrations/versions/2.29/3-remove-page-type-column.js +++ b/core/server/data/migrations/versions/2.29/3-remove-page-type-column.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const commands = require('../../../schema').commands; const createLog = type => msg => logging[type](msg); diff --git a/core/server/data/migrations/versions/2.3/1-add-webhook-columns.js b/core/server/data/migrations/versions/2.3/1-add-webhook-columns.js index 1c264c2d8e..a6feb349db 100644 --- a/core/server/data/migrations/versions/2.3/1-add-webhook-columns.js +++ b/core/server/data/migrations/versions/2.3/1-add-webhook-columns.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const commands = require('../../../schema').commands; const table = 'webhooks'; const newColumnNames = [ diff --git a/core/server/data/migrations/versions/2.3/2-add-webhook-edit-permission.js b/core/server/data/migrations/versions/2.3/2-add-webhook-edit-permission.js index 0645a41bce..f97e6d2bb2 100644 --- a/core/server/data/migrations/versions/2.3/2-add-webhook-edit-permission.js +++ b/core/server/data/migrations/versions/2.3/2-add-webhook-edit-permission.js @@ -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 resources = ['webhook']; const _private = {}; diff --git a/core/server/data/migrations/versions/2.33/01-correct-members-stripe-customers-table.js b/core/server/data/migrations/versions/2.33/01-correct-members-stripe-customers-table.js index 299bcb0016..acf358ba83 100644 --- a/core/server/data/migrations/versions/2.33/01-correct-members-stripe-customers-table.js +++ b/core/server/data/migrations/versions/2.33/01-correct-members-stripe-customers-table.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const commands = require('../../../schema/commands'); module.exports = { diff --git a/core/server/data/migrations/versions/2.34/01-add-stripe-customers-subscriptions-table.js b/core/server/data/migrations/versions/2.34/01-add-stripe-customers-subscriptions-table.js index 09922de4df..d184a0d2f8 100644 --- a/core/server/data/migrations/versions/2.34/01-add-stripe-customers-subscriptions-table.js +++ b/core/server/data/migrations/versions/2.34/01-add-stripe-customers-subscriptions-table.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const commands = require('../../../schema/commands'); module.exports = { diff --git a/core/server/data/migrations/versions/2.37/01-add-self-signup-and-from address-to-members-settings.js b/core/server/data/migrations/versions/2.37/01-add-self-signup-and-from address-to-members-settings.js index 3612fb32af..51ff5d1717 100644 --- a/core/server/data/migrations/versions/2.37/01-add-self-signup-and-from address-to-members-settings.js +++ b/core/server/data/migrations/versions/2.37/01-add-self-signup-and-from address-to-members-settings.js @@ -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 diff --git a/core/server/data/migrations/versions/2.6/1-add-webhook-permission-roles.js b/core/server/data/migrations/versions/2.6/1-add-webhook-permission-roles.js index 42de2eb16e..bd7661b44a 100644 --- a/core/server/data/migrations/versions/2.6/1-add-webhook-permission-roles.js +++ b/core/server/data/migrations/versions/2.6/1-add-webhook-permission-roles.js @@ -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 resources = ['webhook']; const _private = {}; diff --git a/core/server/data/migrations/versions/2.8/1-add-members-table.js b/core/server/data/migrations/versions/2.8/1-add-members-table.js index 67bf0710c8..5d9b046147 100644 --- a/core/server/data/migrations/versions/2.8/1-add-members-table.js +++ b/core/server/data/migrations/versions/2.8/1-add-members-table.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const commands = require('../../../schema').commands; const table = 'members'; const message1 = 'Adding table: ' + table; diff --git a/core/server/data/migrations/versions/3.0/01-remove-user-ghost-auth-columns.js b/core/server/data/migrations/versions/3.0/01-remove-user-ghost-auth-columns.js index 585779cbfd..38e43e98d3 100644 --- a/core/server/data/migrations/versions/3.0/01-remove-user-ghost-auth-columns.js +++ b/core/server/data/migrations/versions/3.0/01-remove-user-ghost-auth-columns.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const commands = require('../../../schema').commands; const createLog = type => msg => logging[type](msg); diff --git a/core/server/data/migrations/versions/3.0/02-drop-token-auth-tables.js b/core/server/data/migrations/versions/3.0/02-drop-token-auth-tables.js index 6d9d26918a..e89bf8287c 100644 --- a/core/server/data/migrations/versions/3.0/02-drop-token-auth-tables.js +++ b/core/server/data/migrations/versions/3.0/02-drop-token-auth-tables.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const commands = require('../../../schema').commands; const tables = [ diff --git a/core/server/data/migrations/versions/3.0/03-drop-client-auth-tables.js b/core/server/data/migrations/versions/3.0/03-drop-client-auth-tables.js index ef8e3efe61..3b4890def9 100644 --- a/core/server/data/migrations/versions/3.0/03-drop-client-auth-tables.js +++ b/core/server/data/migrations/versions/3.0/03-drop-client-auth-tables.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const commands = require('../../../schema').commands; const tables = [ diff --git a/core/server/data/migrations/versions/3.0/04-add-posts-meta-table.js b/core/server/data/migrations/versions/3.0/04-add-posts-meta-table.js index 3520d72fad..bbe729aff8 100644 --- a/core/server/data/migrations/versions/3.0/04-add-posts-meta-table.js +++ b/core/server/data/migrations/versions/3.0/04-add-posts-meta-table.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const commands = require('../../../schema').commands; const table = 'posts_meta'; const message1 = `Adding table: ${table}`; diff --git a/core/server/data/migrations/versions/3.0/05-populate-posts-meta-table.js b/core/server/data/migrations/versions/3.0/05-populate-posts-meta-table.js index ec3c164d67..4346b690bc 100644 --- a/core/server/data/migrations/versions/3.0/05-populate-posts-meta-table.js +++ b/core/server/data/migrations/versions/3.0/05-populate-posts-meta-table.js @@ -2,7 +2,7 @@ const postsMetaSchema = require('../../../schema').tables.posts_meta; const ObjectId = require('bson-objectid'); const _ = require('lodash'); const models = require('../../../../models'); -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); module.exports.config = { transaction: true diff --git a/core/server/data/migrations/versions/3.0/07-add-posts-type-column.js b/core/server/data/migrations/versions/3.0/07-add-posts-type-column.js index 807ea290b3..4ecbdc29a1 100644 --- a/core/server/data/migrations/versions/3.0/07-add-posts-type-column.js +++ b/core/server/data/migrations/versions/3.0/07-add-posts-type-column.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const commands = require('../../../schema').commands; const createLog = type => msg => logging[type](msg); diff --git a/core/server/data/migrations/versions/3.0/08-populate-posts-type-column.js b/core/server/data/migrations/versions/3.0/08-populate-posts-type-column.js index 7f32678c85..2d4b550aba 100644 --- a/core/server/data/migrations/versions/3.0/08-populate-posts-type-column.js +++ b/core/server/data/migrations/versions/3.0/08-populate-posts-type-column.js @@ -1,6 +1,6 @@ const Promise = require('bluebird'); const toPairs = require('lodash/toPairs'); -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); /* * @param from: object with a SINGLE entry { 'fromColumn': 'fromValue' } diff --git a/core/server/data/migrations/versions/3.0/09-remove-posts-page-column.js b/core/server/data/migrations/versions/3.0/09-remove-posts-page-column.js index 1c9c38d1b0..1ea5480d64 100644 --- a/core/server/data/migrations/versions/3.0/09-remove-posts-page-column.js +++ b/core/server/data/migrations/versions/3.0/09-remove-posts-page-column.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const commands = require('../../../schema').commands; const createLog = type => msg => logging[type](msg); diff --git a/core/server/data/migrations/versions/3.0/10-remove-empty-strings.js b/core/server/data/migrations/versions/3.0/10-remove-empty-strings.js index 94cc5ad6ff..d7c9b2c958 100644 --- a/core/server/data/migrations/versions/3.0/10-remove-empty-strings.js +++ b/core/server/data/migrations/versions/3.0/10-remove-empty-strings.js @@ -1,5 +1,5 @@ const Promise = require('bluebird'); -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const schema = require('../../../schema'); /* diff --git a/core/server/data/migrations/versions/3.0/11-update-posts-html.js b/core/server/data/migrations/versions/3.0/11-update-posts-html.js index 442e83aedb..65834dfdfd 100644 --- a/core/server/data/migrations/versions/3.0/11-update-posts-html.js +++ b/core/server/data/migrations/versions/3.0/11-update-posts-html.js @@ -1,7 +1,7 @@ const _ = require('lodash'); const Promise = require('bluebird'); const htmlToText = require('html-to-text'); -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const mobiledocLib = require('../../../../lib/mobiledoc'); module.exports.config = { diff --git a/core/server/data/migrations/versions/3.0/12-populate-members-table-from-subscribers.js b/core/server/data/migrations/versions/3.0/12-populate-members-table-from-subscribers.js index 879e557d5a..ec31006520 100644 --- a/core/server/data/migrations/versions/3.0/12-populate-members-table-from-subscribers.js +++ b/core/server/data/migrations/versions/3.0/12-populate-members-table-from-subscribers.js @@ -1,6 +1,6 @@ const ObjectId = require('bson-objectid'); const _ = require('lodash'); -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); module.exports.config = { transaction: true, diff --git a/core/server/data/migrations/versions/3.0/13-drop-subscribers-table.js b/core/server/data/migrations/versions/3.0/13-drop-subscribers-table.js index b0b407873d..7a2f005bd3 100644 --- a/core/server/data/migrations/versions/3.0/13-drop-subscribers-table.js +++ b/core/server/data/migrations/versions/3.0/13-drop-subscribers-table.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const commands = require('../../../schema').commands; const tables = [ diff --git a/core/server/data/migrations/versions/3.0/14-remove-subscribers-flag.js b/core/server/data/migrations/versions/3.0/14-remove-subscribers-flag.js index e16b6044c0..948f6eb8ba 100644 --- a/core/server/data/migrations/versions/3.0/14-remove-subscribers-flag.js +++ b/core/server/data/migrations/versions/3.0/14-remove-subscribers-flag.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); module.exports = { async up({connection}) { diff --git a/core/server/data/migrations/versions/3.1/03-add-email-preview-permissions.js b/core/server/data/migrations/versions/3.1/03-add-email-preview-permissions.js index 00f85a5757..6b46374dec 100644 --- a/core/server/data/migrations/versions/3.1/03-add-email-preview-permissions.js +++ b/core/server/data/migrations/versions/3.1/03-add-email-preview-permissions.js @@ -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 resources = ['email_preview']; const _private = {}; diff --git a/core/server/data/migrations/versions/3.1/04-add-subscribed-flag-to-members.js b/core/server/data/migrations/versions/3.1/04-add-subscribed-flag-to-members.js index a393ea3b83..14af3b72f4 100644 --- a/core/server/data/migrations/versions/3.1/04-add-subscribed-flag-to-members.js +++ b/core/server/data/migrations/versions/3.1/04-add-subscribed-flag-to-members.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const commands = require('../../../schema').commands; const createLog = type => msg => logging[type](msg); diff --git a/core/server/data/migrations/versions/3.1/05-add-emails-table.js b/core/server/data/migrations/versions/3.1/05-add-emails-table.js index 3e3754e404..eab763e452 100644 --- a/core/server/data/migrations/versions/3.1/05-add-emails-table.js +++ b/core/server/data/migrations/versions/3.1/05-add-emails-table.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const commands = require('../../../schema').commands; const table = 'emails'; const message1 = 'Adding table: ' + table; diff --git a/core/server/data/migrations/versions/3.1/06-add-email-permissions.js b/core/server/data/migrations/versions/3.1/06-add-email-permissions.js index 9bae67500f..9b7d926e81 100644 --- a/core/server/data/migrations/versions/3.1/06-add-email-permissions.js +++ b/core/server/data/migrations/versions/3.1/06-add-email-permissions.js @@ -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 resources = ['email']; const _private = {}; diff --git a/core/server/data/migrations/versions/3.1/07-add-uuid-field-to-members.js b/core/server/data/migrations/versions/3.1/07-add-uuid-field-to-members.js index 90c5a8cb6e..94d06a52f3 100644 --- a/core/server/data/migrations/versions/3.1/07-add-uuid-field-to-members.js +++ b/core/server/data/migrations/versions/3.1/07-add-uuid-field-to-members.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const commands = require('../../../schema').commands; const createLog = type => msg => logging[type](msg); diff --git a/core/server/data/migrations/versions/3.1/08-add-uuid-values-to-members.js b/core/server/data/migrations/versions/3.1/08-add-uuid-values-to-members.js index f14a22909c..0e18ff67a9 100644 --- a/core/server/data/migrations/versions/3.1/08-add-uuid-values-to-members.js +++ b/core/server/data/migrations/versions/3.1/08-add-uuid-values-to-members.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const uuid = require('uuid'); module.exports = { diff --git a/core/server/data/migrations/versions/3.1/09-add-further-email-permissions.js b/core/server/data/migrations/versions/3.1/09-add-further-email-permissions.js index 9bae67500f..9b7d926e81 100644 --- a/core/server/data/migrations/versions/3.1/09-add-further-email-permissions.js +++ b/core/server/data/migrations/versions/3.1/09-add-further-email-permissions.js @@ -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 resources = ['email']; const _private = {}; diff --git a/core/server/data/migrations/versions/3.11/01-remove-broken-complimentary-plan-from-members-settings.js b/core/server/data/migrations/versions/3.11/01-remove-broken-complimentary-plan-from-members-settings.js index 063fdce728..ebe87b8e55 100644 --- a/core/server/data/migrations/versions/3.11/01-remove-broken-complimentary-plan-from-members-settings.js +++ b/core/server/data/migrations/versions/3.11/01-remove-broken-complimentary-plan-from-members-settings.js @@ -1,6 +1,6 @@ const _ = require('lodash'); const Promise = require('bluebird'); -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const debug = require('ghost-ignition').debug('migrations'); module.exports.config = { diff --git a/core/server/data/migrations/versions/3.12/01-add-identity-permission.js b/core/server/data/migrations/versions/3.12/01-add-identity-permission.js index f2f6ac2c95..cab5eab857 100644 --- a/core/server/data/migrations/versions/3.12/01-add-identity-permission.js +++ b/core/server/data/migrations/versions/3.12/01-add-identity-permission.js @@ -1,5 +1,5 @@ const ObjectId = require('bson-objectid'); -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); module.exports.config = { transaction: true diff --git a/core/server/data/migrations/versions/3.12/02-remove-legacy-is-paid-flag-from-settings.js b/core/server/data/migrations/versions/3.12/02-remove-legacy-is-paid-flag-from-settings.js index 35a708ae8f..ba3775681b 100644 --- a/core/server/data/migrations/versions/3.12/02-remove-legacy-is-paid-flag-from-settings.js +++ b/core/server/data/migrations/versions/3.12/02-remove-legacy-is-paid-flag-from-settings.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const debug = require('ghost-ignition').debug('migrations'); module.exports.config = { diff --git a/core/server/data/migrations/versions/3.6/1-add-labels-table.js b/core/server/data/migrations/versions/3.6/1-add-labels-table.js index b585ab657f..46d25d4c95 100644 --- a/core/server/data/migrations/versions/3.6/1-add-labels-table.js +++ b/core/server/data/migrations/versions/3.6/1-add-labels-table.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const commands = require('../../../schema').commands; const table = 'labels'; const message1 = 'Adding table: ' + table; diff --git a/core/server/data/migrations/versions/3.6/2-add-members-labels-table.js b/core/server/data/migrations/versions/3.6/2-add-members-labels-table.js index 3bfad831c7..5e02a64057 100644 --- a/core/server/data/migrations/versions/3.6/2-add-members-labels-table.js +++ b/core/server/data/migrations/versions/3.6/2-add-members-labels-table.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const commands = require('../../../schema').commands; const table = 'members_labels'; const message1 = 'Adding table: ' + table; diff --git a/core/server/data/migrations/versions/3.6/3-add-labels-permissions.js b/core/server/data/migrations/versions/3.6/3-add-labels-permissions.js index 052cd0e52b..388e2cd564 100644 --- a/core/server/data/migrations/versions/3.6/3-add-labels-permissions.js +++ b/core/server/data/migrations/versions/3.6/3-add-labels-permissions.js @@ -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 resources = ['label']; const _private = {}; diff --git a/core/server/data/migrations/versions/3.7/01-fix-incorrect-member-labels-foreign-keys.js b/core/server/data/migrations/versions/3.7/01-fix-incorrect-member-labels-foreign-keys.js index db5799dd35..6e303bfde0 100644 --- a/core/server/data/migrations/versions/3.7/01-fix-incorrect-member-labels-foreign-keys.js +++ b/core/server/data/migrations/versions/3.7/01-fix-incorrect-member-labels-foreign-keys.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const commands = require('../../../schema').commands; const table = 'members_labels'; diff --git a/core/server/data/migrations/versions/3.9/01-add-member-sigin-url-permissions.js b/core/server/data/migrations/versions/3.9/01-add-member-sigin-url-permissions.js index 3ad78d62a7..6df71eafc0 100644 --- a/core/server/data/migrations/versions/3.9/01-add-member-sigin-url-permissions.js +++ b/core/server/data/migrations/versions/3.9/01-add-member-sigin-url-permissions.js @@ -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 resources = ['member_signin_url']; const _private = {}; diff --git a/core/server/data/schema/commands.js b/core/server/data/schema/commands.js index 146deb3b4d..d9bbe0d9f4 100644 --- a/core/server/data/schema/commands.js +++ b/core/server/data/schema/commands.js @@ -1,6 +1,7 @@ const _ = require('lodash'); const Promise = require('bluebird'); -const {i18n, logging} = require('../../lib/common'); +const {i18n} = require('../../lib/common'); +const logging = require('../../../shared/logging'); const db = require('../db'); const schema = require('./schema'); const clients = require('./clients'); diff --git a/core/server/data/schema/fixtures/utils.js b/core/server/data/schema/fixtures/utils.js index 43c5935a85..a1d75173fe 100644 --- a/core/server/data/schema/fixtures/utils.js +++ b/core/server/data/schema/fixtures/utils.js @@ -3,7 +3,7 @@ const _ = require('lodash'); const Promise = require('bluebird'); -const {logging} = require('../../../lib/common'); +const logging = require('../../../../shared/logging'); const models = require('../../../models'); const baseUtils = require('../../../models/base/utils'); const sequence = require('../../../lib/promise/sequence'); diff --git a/core/server/ghost-server.js b/core/server/ghost-server.js index e2cb498e6f..f9b8dab4f1 100644 --- a/core/server/ghost-server.js +++ b/core/server/ghost-server.js @@ -9,7 +9,8 @@ const _ = require('lodash'); const config = require('../shared/config'); const urlUtils = require('./../shared/url-utils'); const errors = require('@tryghost/errors'); -const {events, i18n, logging} = require('./lib/common'); +const {events, i18n} = require('./lib/common'); +const logging = require('../shared/logging'); const moment = require('moment'); /** diff --git a/core/server/index.js b/core/server/index.js index 690ef68961..a5a2b004d0 100644 --- a/core/server/index.js +++ b/core/server/index.js @@ -12,7 +12,8 @@ require('./overrides'); const debug = require('ghost-ignition').debug('boot:init'); const Promise = require('bluebird'); const config = require('../shared/config'); -const {events, i18n, logging} = require('./lib/common'); +const {events, i18n} = require('./lib/common'); +const logging = require('../shared/logging'); const migrator = require('./data/db/migrator'); const urlUtils = require('./../shared/url-utils'); let parentApp; diff --git a/core/server/lib/common/index.js b/core/server/lib/common/index.js index 9bc77f0c34..d821b83b9d 100644 --- a/core/server/lib/common/index.js +++ b/core/server/lib/common/index.js @@ -5,9 +5,5 @@ module.exports = { get events() { return require('./events'); - }, - - get logging() { - return require('./logging'); } }; diff --git a/core/server/lib/image/cached-image-size-from-url.js b/core/server/lib/image/cached-image-size-from-url.js index 2520fe799b..d474527c12 100644 --- a/core/server/lib/image/cached-image-size-from-url.js +++ b/core/server/lib/image/cached-image-size-from-url.js @@ -1,7 +1,7 @@ const debug = require('ghost-ignition').debug('utils:image-size-cache'); const imageSize = require('./image-size'); const errors = require('@tryghost/errors'); -const {logging} = require('../common'); +const logging = require('../../../shared/logging'); const cache = {}; /** diff --git a/core/server/lib/mobiledoc.js b/core/server/lib/mobiledoc.js index 878a4b217a..e7f7b1464e 100644 --- a/core/server/lib/mobiledoc.js +++ b/core/server/lib/mobiledoc.js @@ -1,5 +1,5 @@ const errors = require('@tryghost/errors'); -const {logging} = require('./common'); +const logging = require('../../shared/logging'); const config = require('../../shared/config'); let cardFactory; diff --git a/core/server/models/api-key.js b/core/server/models/api-key.js index 0bbb9aff8d..2eaaff5d66 100644 --- a/core/server/models/api-key.js +++ b/core/server/models/api-key.js @@ -1,5 +1,5 @@ const omit = require('lodash/omit'); -const {logging} = require('../lib/common'); +const logging = require('../../shared/logging'); const errors = require('@tryghost/errors'); const _ = require('lodash'); const crypto = require('crypto'); diff --git a/core/server/models/base/index.js b/core/server/models/base/index.js index 3ecbaa4502..29c8baa640 100644 --- a/core/server/models/base/index.js +++ b/core/server/models/base/index.js @@ -15,7 +15,8 @@ const ObjectId = require('bson-objectid'); const debug = require('ghost-ignition').debug('models:base'); const config = require('../../../shared/config'); const db = require('../../data/db'); -const {logging, events, i18n} = require('../../lib/common'); +const {events, i18n} = require('../../lib/common'); +const logging = require('../../../shared/logging'); const errors = require('@tryghost/errors'); const security = require('../../lib/security'); const schema = require('../../data/schema'); diff --git a/core/server/models/base/listeners.js b/core/server/models/base/listeners.js index 9996ad55b5..116e558bcc 100644 --- a/core/server/models/base/listeners.js +++ b/core/server/models/base/listeners.js @@ -1,7 +1,8 @@ const moment = require('moment-timezone'); const _ = require('lodash'); const models = require('../../models'); -const {events, logging} = require('../../lib/common'); +const {events} = require('../../lib/common'); +const logging = require('../../../shared/logging'); const errors = require('@tryghost/errors'); const sequence = require('../../lib/promise/sequence'); diff --git a/core/server/services/auth/setup.js b/core/server/services/auth/setup.js index 2fc3df9d0d..97514dabdb 100644 --- a/core/server/services/auth/setup.js +++ b/core/server/services/auth/setup.js @@ -1,7 +1,8 @@ const _ = require('lodash'); const config = require('../../../shared/config'); const errors = require('@tryghost/errors'); -const {i18n, logging} = require('../../lib/common'); +const {i18n} = require('../../lib/common'); +const logging = require('../../../shared/logging'); const models = require('../../models'); const mail = require('../mail'); diff --git a/core/server/services/bulk-email/index.js b/core/server/services/bulk-email/index.js index 4a7ec509fb..1d58444b73 100644 --- a/core/server/services/bulk-email/index.js +++ b/core/server/services/bulk-email/index.js @@ -1,6 +1,7 @@ const _ = require('lodash'); const errors = require('@tryghost/errors'); -const {i18n, logging} = require('../../lib/common'); +const {i18n} = require('../../lib/common'); +const logging = require('../../../shared/logging'); const mailgunProvider = require('./mailgun'); const configService = require('../../../shared/config'); const settingsCache = require('../settings/cache'); diff --git a/core/server/services/bulk-email/mailgun.js b/core/server/services/bulk-email/mailgun.js index 9a6e1f0e15..cd06f5812b 100644 --- a/core/server/services/bulk-email/mailgun.js +++ b/core/server/services/bulk-email/mailgun.js @@ -1,6 +1,6 @@ const {URL} = require('url'); const mailgun = require('mailgun-js'); -const {logging} = require('../../lib/common'); +const logging = require('../../../shared/logging'); const configService = require('../../../shared/config'); const settingsCache = require('../settings/cache'); diff --git a/core/server/services/labs.js b/core/server/services/labs.js index f5734703e0..402211f31b 100644 --- a/core/server/services/labs.js +++ b/core/server/services/labs.js @@ -3,7 +3,8 @@ const _ = require('lodash'); const Promise = require('bluebird'); const SafeString = require('../../frontend/services/themes/engine').SafeString; const errors = require('@tryghost/errors'); -const {i18n, logging} = require('../lib/common'); +const {i18n} = require('../lib/common'); +const logging = require('../../shared/logging'); const deprecatedFeatures = ['subscribers', 'publicAPI']; module.exports.getAll = () => { diff --git a/core/server/services/mega/mega.js b/core/server/services/mega/mega.js index 1c41be7a38..9d7c420742 100644 --- a/core/server/services/mega/mega.js +++ b/core/server/services/mega/mega.js @@ -2,7 +2,8 @@ const _ = require('lodash'); const url = require('url'); const moment = require('moment'); const errors = require('@tryghost/errors'); -const {events, i18n, logging} = require('../../lib/common'); +const {events, i18n} = require('../../lib/common'); +const logging = require('../../../shared/logging'); const membersService = require('../members'); const bulkEmailService = require('../bulk-email'); const models = require('../../models'); diff --git a/core/server/services/members/api.js b/core/server/services/members/api.js index a918b89c25..82fac1cddd 100644 --- a/core/server/services/members/api.js +++ b/core/server/services/members/api.js @@ -1,6 +1,6 @@ const settingsCache = require('../settings/cache'); const MembersApi = require('@tryghost/members-api'); -const {logging} = require('../../lib/common'); +const logging = require('../../../shared/logging'); const mail = require('../mail'); const models = require('../../models'); const signinEmail = require('./emails/signin'); diff --git a/core/server/services/members/config.js b/core/server/services/members/config.js index 437be11add..e4e5c58da3 100644 --- a/core/server/services/members/config.js +++ b/core/server/services/members/config.js @@ -3,7 +3,7 @@ const settingsCache = require('../settings/cache'); const ghostVersion = require('../../lib/ghost-version'); const crypto = require('crypto'); const path = require('path'); -const {logging} = require('../../lib/common'); +const logging = require('../../../shared/logging'); const urlUtils = require('../../../shared/url-utils'); const COMPLIMENTARY_PLAN = { diff --git a/core/server/services/members/index.js b/core/server/services/members/index.js index 4f59266f9a..7d76ec2e48 100644 --- a/core/server/services/members/index.js +++ b/core/server/services/members/index.js @@ -1,7 +1,8 @@ const MembersSSR = require('@tryghost/members-ssr'); const createMembersApiInstance = require('./api'); -const {events, logging} = require('../../lib/common'); +const {events} = require('../../lib/common'); +const logging = require('../../../shared/logging'); const urlUtils = require('../../../shared/url-utils'); const settingsCache = require('../settings/cache'); diff --git a/core/server/services/members/middleware.js b/core/server/services/members/middleware.js index 4a1d0b4979..1f40022070 100644 --- a/core/server/services/members/middleware.js +++ b/core/server/services/members/middleware.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const {logging} = require('../../lib/common'); +const logging = require('../../../shared/logging'); const config = require('../../../shared/config'); const labsService = require('../labs'); const membersService = require('./index'); diff --git a/core/server/services/slack.js b/core/server/services/slack.js index 1d4710c694..d0de6bf4e2 100644 --- a/core/server/services/slack.js +++ b/core/server/services/slack.js @@ -1,5 +1,6 @@ const errors = require('@tryghost/errors'); -const {events, i18n, logging} = require('../lib/common'); +const {events, i18n} = require('../lib/common'); +const logging = require('../../shared/logging'); const request = require('../lib/request'); const {blogIcon} = require('../lib/image'); const urlUtils = require('../../shared/url-utils'); diff --git a/core/server/services/webhooks/trigger.js b/core/server/services/webhooks/trigger.js index 1ee435d5bf..01b846f4c2 100644 --- a/core/server/services/webhooks/trigger.js +++ b/core/server/services/webhooks/trigger.js @@ -1,6 +1,6 @@ const _ = require('lodash'); const debug = require('ghost-ignition').debug('services:webhooks:trigger'); -const {logging} = require('../../lib/common'); +const logging = require('../../../shared/logging'); const request = require('../../lib/request'); const models = require('../../models'); const payload = require('./payload'); diff --git a/core/server/services/xmlrpc.js b/core/server/services/xmlrpc.js index faad7ccc67..a76f5454c2 100644 --- a/core/server/services/xmlrpc.js +++ b/core/server/services/xmlrpc.js @@ -3,7 +3,8 @@ const xml = require('xml'); const config = require('../../shared/config'); const urlService = require('../../frontend/services/url'); const errors = require('@tryghost/errors'); -const {events, i18n, logging} = require('../lib/common'); +const {events, i18n} = require('../lib/common'); +const logging = require('../../shared/logging'); const request = require('../lib/request'); const settingsCache = require('./settings/cache'); diff --git a/core/server/update-check.js b/core/server/update-check.js index d84d971b44..d5e1d04e1c 100644 --- a/core/server/update-check.js +++ b/core/server/update-check.js @@ -19,7 +19,8 @@ const api = require('./api').v2; const config = require('../shared/config'); const urlUtils = require('./../shared/url-utils'); const errors = require('@tryghost/errors'); -const {i18n, logging} = require('./lib/common'); +const {i18n} = require('./lib/common'); +const logging = require('../shared/logging'); const request = require('./lib/request'); const ghostVersion = require('./lib/ghost-version'); const internal = {context: {internal: true}}; diff --git a/core/server/web/admin/controller.js b/core/server/web/admin/controller.js index bc9e9fe6a5..26963a4301 100644 --- a/core/server/web/admin/controller.js +++ b/core/server/web/admin/controller.js @@ -2,7 +2,7 @@ const debug = require('ghost-ignition').debug('web:admin:controller'); const path = require('path'); const config = require('../../../shared/config'); const updateCheck = require('../../update-check'); -const {logging} = require('../../lib/common'); +const logging = require('../../../shared/logging'); /** * @description Admin controller to handle /ghost/ requests. diff --git a/core/server/web/api/middleware/normalize-image.js b/core/server/web/api/middleware/normalize-image.js index 24e49fd75a..f090dcd2c2 100644 --- a/core/server/web/api/middleware/normalize-image.js +++ b/core/server/web/api/middleware/normalize-image.js @@ -1,6 +1,6 @@ const cloneDeep = require('lodash/cloneDeep'); const config = require('../../../../shared/config'); -const {logging} = require('../../../lib/common'); +const logging = require('../../../../shared/logging'); const imageTransform = require('@tryghost/image-transform'); module.exports = function normalize(req, res, next) { diff --git a/core/server/web/api/middleware/upload.js b/core/server/web/api/middleware/upload.js index c102bf3b04..e753387586 100644 --- a/core/server/web/api/middleware/upload.js +++ b/core/server/web/api/middleware/upload.js @@ -4,7 +4,8 @@ const multer = require('multer'); const fs = require('fs-extra'); const errors = require('@tryghost/errors'); const config = require('../../../../shared/config'); -const {i18n,logging} = require('../../../lib/common'); +const {i18n} = require('../../../lib/common'); +const logging = require('../../../../shared/logging'); const upload = { enabledClear: config.get('uploadClear') || true, diff --git a/core/server/web/parent/middleware/log-request.js b/core/server/web/parent/middleware/log-request.js index a7e1c79044..7eedfc7b83 100644 --- a/core/server/web/parent/middleware/log-request.js +++ b/core/server/web/parent/middleware/log-request.js @@ -1,4 +1,4 @@ -const {logging} = require('../../../lib/common'); +const logging = require('../../../../shared/logging'); /** * @TODO: move this middleware to ignition? diff --git a/core/server/web/shared/middlewares/api/spam-prevention.js b/core/server/web/shared/middlewares/api/spam-prevention.js index 2cb5747f25..e8d70d8b32 100644 --- a/core/server/web/shared/middlewares/api/spam-prevention.js +++ b/core/server/web/shared/middlewares/api/spam-prevention.js @@ -3,7 +3,8 @@ const extend = require('lodash/extend'); const pick = require('lodash/pick'); const errors = require('@tryghost/errors'); const config = require('../../../../../shared/config'); -const {logging,i18n} = require('../../../../lib/common'); +const {i18n} = require('../../../../lib/common'); +const logging = require('../../../../../shared/logging'); const spam = config.get('spam') || {}; const spamPrivateBlock = spam.private_block || {}; diff --git a/core/server/web/shared/middlewares/custom-redirects.js b/core/server/web/shared/middlewares/custom-redirects.js index 3dbed5c614..50d2ca133b 100644 --- a/core/server/web/shared/middlewares/custom-redirects.js +++ b/core/server/web/shared/middlewares/custom-redirects.js @@ -6,7 +6,8 @@ const debug = require('ghost-ignition').debug('web:shared:mw:custom-redirects'); const config = require('../../../../shared/config'); const urlUtils = require('../../../../shared/url-utils'); const errors = require('@tryghost/errors'); -const {logging, i18n} = require('../../../lib/common'); +const {i18n} = require('../../../lib/common'); +const logging = require('../../../../shared/logging'); const redirectsService = require('../../../../frontend/services/redirects'); const _private = {}; diff --git a/core/server/lib/common/logging.js b/core/shared/logging.js similarity index 90% rename from core/server/lib/common/logging.js rename to core/shared/logging.js index afc32eacf0..e057e8166b 100644 --- a/core/server/lib/common/logging.js +++ b/core/shared/logging.js @@ -1,4 +1,4 @@ -const config = require('../../../shared/config'); +const config = require('./config'); const {logging} = require('ghost-ignition'); module.exports = logging({ diff --git a/index.js b/index.js index 35b9b86dbe..2bb0aaf2c1 100644 --- a/index.js +++ b/index.js @@ -13,7 +13,7 @@ const ghost = require('./core'); debug('Required ghost'); const express = require('./core/shared/express'); -const {logging} = require('./core/server/lib/common'); +const logging = require('./core/shared/logging'); const urlService = require('./core/frontend/services/url'); // This is what listen gets called on, it needs to be a full Express App const ghostApp = express('ghost'); diff --git a/test/unit/helpers/img_url_spec.js b/test/unit/helpers/img_url_spec.js index 1d01a2aa66..1fbdb9b798 100644 --- a/test/unit/helpers/img_url_spec.js +++ b/test/unit/helpers/img_url_spec.js @@ -5,13 +5,13 @@ const urlUtils = require('../../utils/urlUtils'); // Stuff we are testing const helpers = require('../../../core/frontend/helpers'); -const common = require('../../../core/server/lib/common'); +const logging = require('../../../core/shared/logging'); describe('{{image}} helper', function () { let logWarnStub; beforeEach(function () { - logWarnStub = sinon.stub(common.logging, 'warn'); + logWarnStub = sinon.stub(logging, 'warn'); }); afterEach(function () { diff --git a/test/unit/helpers/is_spec.js b/test/unit/helpers/is_spec.js index 243577f8f9..40e307cffc 100644 --- a/test/unit/helpers/is_spec.js +++ b/test/unit/helpers/is_spec.js @@ -1,7 +1,6 @@ -const should = require('should'); const sinon = require('sinon'); const helpers = require('../../../core/frontend/helpers'); -const common = require('../../../core/server/lib/common'); +const logging = require('../../../core/shared/logging'); describe('{{#is}} helper', function () { afterEach(function () { @@ -54,7 +53,7 @@ describe('{{#is}} helper', function () { it('should log warning with no args', function () { const fn = sinon.spy(); const inverse = sinon.spy(); - const logWarn = sinon.stub(common.logging, 'warn'); + const logWarn = sinon.stub(logging, 'warn'); helpers.is.call( {}, diff --git a/test/unit/services/slack_spec.js b/test/unit/services/slack_spec.js index 4ce1bf4ff3..f4b8d6e8b1 100644 --- a/test/unit/services/slack_spec.js +++ b/test/unit/services/slack_spec.js @@ -7,7 +7,8 @@ const configUtils = require('../../utils/configUtils'); // Stuff we test const slack = rewire('../../../core/server/services/slack'); -const {logging, events} = require('../../../core/server/lib/common'); +const {events} = require('../../../core/server/lib/common'); +const logging = require('../../../core/shared/logging'); const imageLib = require('../../../core/server/lib/image'); const urlService = require('../../../core/frontend/services/url'); const schema = require('../../../core/server/data/schema').checks; diff --git a/test/unit/services/url/Queue_spec.js b/test/unit/services/url/Queue_spec.js index be144f3766..1c3bd21d68 100644 --- a/test/unit/services/url/Queue_spec.js +++ b/test/unit/services/url/Queue_spec.js @@ -1,8 +1,7 @@ const _ = require('lodash'); -const Promise = require('bluebird'); const should = require('should'); const sinon = require('sinon'); -const {logging} = require('../../../../core/server/lib/common'); +const logging = require('../../../../core/shared/logging'); const Queue = require('../../../../core/frontend/services/url/Queue'); describe('Unit: services/url/Queue', function () { diff --git a/test/unit/services/xmlrpc_spec.js b/test/unit/services/xmlrpc_spec.js index 460367f583..61bbfab140 100644 --- a/test/unit/services/xmlrpc_spec.js +++ b/test/unit/services/xmlrpc_spec.js @@ -1,19 +1,18 @@ -const should = require('should'); const sinon = require('sinon'); const _ = require('lodash'); const nock = require('nock'); -const http = require('http'); const rewire = require('rewire'); const testUtils = require('../../utils'); const configUtils = require('../../utils/configUtils'); const xmlrpc = rewire('../../../core/server/services/xmlrpc'); -const common = require('../../../core/server/lib/common'); +const {events} = require('../../../core/server/lib/common'); +const logging = require('../../../core/shared/logging'); describe('XMLRPC', function () { let eventStub; beforeEach(function () { - eventStub = sinon.stub(common.events, 'on'); + eventStub = sinon.stub(events, 'on'); configUtils.set('privacy:useRpcPing', true); }); @@ -124,7 +123,7 @@ describe('XMLRPC', function () { it('captures && logs errors from requests', function (done) { const testPost = _.clone(testUtils.DataGenerator.Content.posts[2]); const ping1 = nock('http://rpc.pingomatic.com').post('/').reply(400); - const loggingStub = sinon.stub(common.logging, 'error'); + const loggingStub = sinon.stub(logging, 'error'); ping(testPost); @@ -167,7 +166,7 @@ describe('XMLRPC', function () { `); - const loggingStub = sinon.stub(common.logging, 'error'); + const loggingStub = sinon.stub(logging, 'error'); ping(testPost); @@ -210,7 +209,7 @@ describe('XMLRPC', function () { `).replace('\n', '')); - const loggingStub = sinon.stub(common.logging, 'error'); + const loggingStub = sinon.stub(logging, 'error'); ping(testPost); @@ -243,7 +242,7 @@ describe('XMLRPC', function () { `); - const loggingStub = sinon.stub(common.logging, 'error'); + const loggingStub = sinon.stub(logging, 'error'); ping(testPost); diff --git a/test/unit/web/api/middleware/normalize-image_spec.js b/test/unit/web/api/middleware/normalize-image_spec.js index eb15d3d0d0..a467aaa733 100644 --- a/test/unit/web/api/middleware/normalize-image_spec.js +++ b/test/unit/web/api/middleware/normalize-image_spec.js @@ -2,7 +2,7 @@ const should = require('should'); const sinon = require('sinon'); const configUtils = require('../../../../utils/configUtils'); const imageTransform = require('@tryghost/image-transform'); -const {logging} = require('../../../../../core/server/lib/common'); +const logging = require('../../../../../core/shared/logging'); const normalize = require('../../../../../core/server/web/api/middleware/normalize-image'); describe('normalize', function () {