diff --git a/app/controllers/admin.js b/app/controllers/admin.js index 56ee142..3ed5939 100644 --- a/app/controllers/admin.js +++ b/app/controllers/admin.js @@ -109,7 +109,7 @@ class AdminController extends SiteController { } module.exports = { - logId: 'admin', + logId: 'ctl:admin', index: 'admin', className: 'AdminController', create: async (dtp) => { return new AdminController(dtp); }, diff --git a/app/controllers/admin/announcement.js b/app/controllers/admin/announcement.js index a292d88..3c0c1d6 100644 --- a/app/controllers/admin/announcement.js +++ b/app/controllers/admin/announcement.js @@ -158,7 +158,7 @@ class AnnouncementAdminController extends SiteController { } module.exports = { - logId: 'announcement', + logId: 'admin:announcement', index: 'announcement', className: 'AnnouncementAdminController', create: async (dtp) => { return new AnnouncementAdminController(dtp); }, diff --git a/app/controllers/admin/attachment.js b/app/controllers/admin/attachment.js index 61f71db..8268f37 100644 --- a/app/controllers/admin/attachment.js +++ b/app/controllers/admin/attachment.js @@ -130,7 +130,7 @@ class AttachmentAdminController extends SiteController { } module.exports = { - logId: 'admin-attachment', + logId: 'admin:admin-attachment', index: 'adminAttachment', className: 'AttachmentAdminController', create: async (dtp) => { return new AttachmentAdminController(dtp); }, diff --git a/app/controllers/admin/content-report.js b/app/controllers/admin/content-report.js index 23496e7..9205988 100644 --- a/app/controllers/admin/content-report.js +++ b/app/controllers/admin/content-report.js @@ -87,7 +87,7 @@ class ContentReportAdminController extends SiteController { } module.exports = { - logId: 'admin-content-report', + logId: 'admin:content-report', index: 'adminContentReport', className: 'ContentReportAdminController', create: async (dtp) => { return new ContentReportAdminController(dtp); }, diff --git a/app/controllers/admin/core-node.js b/app/controllers/admin/core-node.js index eac1bd5..519ed63 100644 --- a/app/controllers/admin/core-node.js +++ b/app/controllers/admin/core-node.js @@ -159,7 +159,7 @@ class CoreNodeAdminController extends SiteController { } module.exports = { - logId: 'admin-core-node', + logId: 'admin:core-node', index: 'adminCoreNode', className: 'CoreNodeAdminController', create: async (dtp) => { return new CoreNodeAdminController(dtp); }, diff --git a/app/controllers/admin/core-user.js b/app/controllers/admin/core-user.js index 9ccbaa6..51b131d 100644 --- a/app/controllers/admin/core-user.js +++ b/app/controllers/admin/core-user.js @@ -88,7 +88,7 @@ class CoreUserAdminController extends SiteController { } module.exports = { - logId: 'admin-core-user', + logId: 'admin:core-user', index: 'adminCoreUser', className: 'CoreUserAdminController', create: async (dtp) => { return new CoreUserAdminController(dtp); }, diff --git a/app/controllers/admin/host.js b/app/controllers/admin/host.js index 0261666..01638ee 100644 --- a/app/controllers/admin/host.js +++ b/app/controllers/admin/host.js @@ -116,7 +116,7 @@ class HostAdminController extends SiteController { } module.exports = { - logId: 'admin-host', + logId: 'admin:host', index: 'adminHost', className: 'HostAdminController', create: async (dtp) => { return new HostAdminController(dtp); }, diff --git a/app/controllers/admin/image.js b/app/controllers/admin/image.js index 1bf628b..4420c1a 100644 --- a/app/controllers/admin/image.js +++ b/app/controllers/admin/image.js @@ -114,7 +114,7 @@ class ImageAdminController extends SiteController { } module.exports = { - logId: 'admin-image', + logId: 'admin:image', index: 'adminImage', className: 'ImageAdminController', create: async (dtp) => { return new ImageAdminController(dtp); }, diff --git a/app/controllers/admin/job-queue.js b/app/controllers/admin/job-queue.js index 63d5a3a..eeba454 100644 --- a/app/controllers/admin/job-queue.js +++ b/app/controllers/admin/job-queue.js @@ -119,7 +119,7 @@ class JobQueueAdminController extends SiteController { } module.exports = { - logId: 'admin-job-queue', + logId: 'admin:job-queue', index: 'adminJobQueue', className: 'JobQueueAdminController', create: async (dtp) => { return new JobQueueAdminController(dtp); }, diff --git a/app/controllers/admin/log.js b/app/controllers/admin/log.js index 48263f9..21a7547 100644 --- a/app/controllers/admin/log.js +++ b/app/controllers/admin/log.js @@ -37,7 +37,7 @@ class LogAdminController extends SiteController { const search = { }; if (req.query.component) { - search.component = { slug: req.query.component }; + search.component = { logId: req.query.component }; } res.locals.logs = await logService.getRecords(search, res.locals.pagination); @@ -51,7 +51,7 @@ class LogAdminController extends SiteController { } module.exports = { - logId: 'admin-log', + logId: 'admin:log', index: 'adminLog', className: 'LogAdminController', create: async (dtp) => { return new LogAdminController(dtp); }, diff --git a/app/controllers/admin/newsletter.js b/app/controllers/admin/newsletter.js index 201c095..fcad904 100644 --- a/app/controllers/admin/newsletter.js +++ b/app/controllers/admin/newsletter.js @@ -167,7 +167,7 @@ class NewsletterAdminController extends SiteController { } module.exports = { - logId: 'admin-newsletter', + logId: 'admin:newsletter', index: 'adminNewsletter', className: 'NewsletterAdminController', create: async (dtp) => { return new NewsletterAdminController(dtp); }, diff --git a/app/controllers/admin/newsroom.js b/app/controllers/admin/newsroom.js index 5c0a943..f88c885 100644 --- a/app/controllers/admin/newsroom.js +++ b/app/controllers/admin/newsroom.js @@ -158,8 +158,8 @@ class NewsroomAdminController extends SiteController { } module.exports = { - logId: 'newsroom-admin', - index: 'newsroomAdmin', + logId: 'admin:newsroom-admin', + index: 'adminNewsroomAdmin', className: 'NewsroomAdminController', create: async (dtp) => { return new NewsroomAdminController(dtp); }, }; \ No newline at end of file diff --git a/app/controllers/admin/otp.js b/app/controllers/admin/otp.js index 8ac2232..0868fbb 100644 --- a/app/controllers/admin/otp.js +++ b/app/controllers/admin/otp.js @@ -49,7 +49,7 @@ class OtpAdminController extends SiteController { } module.exports = { - logId: 'admin-otp', + logId: 'admin:otp', index: 'adminOtp', className: 'OtpAdminController', create: async (dtp) => { return new OtpAdminController(dtp); }, diff --git a/app/controllers/admin/service-node.js b/app/controllers/admin/service-node.js index f1bf683..a277f72 100644 --- a/app/controllers/admin/service-node.js +++ b/app/controllers/admin/service-node.js @@ -128,7 +128,7 @@ class ServiceNodeAdminController extends SiteController { } module.exports = { - logId: 'admin-service-node', + logId: 'admin:service-node', index: 'adminServiceNode', className: 'ServiceNodeAdminController', create: async (dtp) => { return new ServiceNodeAdminController(dtp); }, diff --git a/app/controllers/admin/settings.js b/app/controllers/admin/settings.js index bc9eac1..24b5e35 100644 --- a/app/controllers/admin/settings.js +++ b/app/controllers/admin/settings.js @@ -98,7 +98,7 @@ class SettingsAdminController extends SiteController { } module.exports = { - logId: 'admin-settings', + logId: 'admin:settings', index: 'adminSettings', className: 'SettingsAdminController', create: async (dtp) => { return new SettingsAdminController(dtp); }, diff --git a/app/controllers/admin/user.js b/app/controllers/admin/user.js index 56efc81..80fb357 100644 --- a/app/controllers/admin/user.js +++ b/app/controllers/admin/user.js @@ -338,7 +338,7 @@ class UserAdminController extends SiteController { } module.exports = { - logId: 'admin-user', + logId: 'admin:user', index: 'adminUser', className: 'UserAdminController', create: async (dtp) => { return new UserAdminController(dtp); }, diff --git a/app/controllers/announcement.js b/app/controllers/announcement.js index ff0f17f..fcc0869 100644 --- a/app/controllers/announcement.js +++ b/app/controllers/announcement.js @@ -76,7 +76,7 @@ class AnnouncementController extends SiteController { } module.exports = { - logId: 'announcement', + logId: 'ctl:announcement', index: 'announcement', className: 'AnnouncementController', create: async (dtp) => { return new AnnouncementController(dtp); }, diff --git a/app/controllers/auth.js b/app/controllers/auth.js index 61429c6..9722902 100644 --- a/app/controllers/auth.js +++ b/app/controllers/auth.js @@ -339,7 +339,7 @@ class AuthController extends SiteController { } module.exports = { - logId: 'auth', + logId: 'ctl:auth', index: 'auth', className: 'AuthController', create: async (dtp) => { return new AuthController(dtp); }, diff --git a/app/controllers/chat.js b/app/controllers/chat.js index 982b33a..11c3943 100644 --- a/app/controllers/chat.js +++ b/app/controllers/chat.js @@ -648,7 +648,7 @@ class ChatController extends SiteController { } module.exports = { - logId: 'chat', + logId: 'ctl:chat', index: 'chat', className: 'ChatController', create: async (dtp) => { return new ChatController(dtp); }, diff --git a/app/controllers/comment.js b/app/controllers/comment.js index e87db14..3b5f18a 100644 --- a/app/controllers/comment.js +++ b/app/controllers/comment.js @@ -151,7 +151,7 @@ class CommentController extends SiteController { } module.exports = { - logId: 'comment', + logId: 'ctl:comment', index: 'comment', className: 'CommentController', create: async (dtp) => { return new CommentController(dtp); }, diff --git a/app/controllers/email.js b/app/controllers/email.js index 45bb185..27b0fd4 100644 --- a/app/controllers/email.js +++ b/app/controllers/email.js @@ -81,7 +81,7 @@ class EmailController extends SiteController { } module.exports = { - logId: 'email', + logId: 'ctl:email', index: 'email', className: 'EmailController', create: async (dtp) => { return new EmailController(dtp); }, diff --git a/app/controllers/form.js b/app/controllers/form.js index b44371a..7b5736c 100644 --- a/app/controllers/form.js +++ b/app/controllers/form.js @@ -64,7 +64,7 @@ class FormController extends SiteController { } module.exports = { - logId: 'form', + logId: 'ctl:form', index: 'form', className: 'FormController', create: async (dtp) => { return new FormController(dtp); }, diff --git a/app/controllers/hive.js b/app/controllers/hive.js index 2b7b7c1..fb9be44 100644 --- a/app/controllers/hive.js +++ b/app/controllers/hive.js @@ -57,7 +57,7 @@ class HiveController extends SiteController { } module.exports = { - logId: 'hive', + logId: 'ctl:hive', index: 'hive', className: 'HiveController', create: async (dtp) => { return new HiveController(dtp); }, diff --git a/app/controllers/hive/kaleidoscope.js b/app/controllers/hive/kaleidoscope.js index 5bc86f9..33a826f 100644 --- a/app/controllers/hive/kaleidoscope.js +++ b/app/controllers/hive/kaleidoscope.js @@ -93,7 +93,7 @@ class HiveKaleidoscopeController extends SiteController { } module.exports = { - logId: 'hive-kaleidoscope', + logId: 'ctl:hive-kaleidoscope', index: 'hiveKaleidoscope', className: 'HiveKaleidoscopeController', create: async (dtp) => { return new HiveKaleidoscopeController(dtp); }, diff --git a/app/controllers/hive/user.js b/app/controllers/hive/user.js index b21dd19..bbbe862 100644 --- a/app/controllers/hive/user.js +++ b/app/controllers/hive/user.js @@ -149,7 +149,7 @@ class HiveUserController extends SiteController { } module.exports = { - logId: 'hive-user', + logId: 'ctl:hive-user', index: 'hiveUser', className: 'HiveUserController', create: async (dtp) => { return new HiveUserController(dtp); }, diff --git a/app/controllers/home.js b/app/controllers/home.js index 8d032b5..cd0951f 100644 --- a/app/controllers/home.js +++ b/app/controllers/home.js @@ -93,7 +93,7 @@ class HomeController extends SiteController { } module.exports = { - logId: 'home', + logId: 'ctl:home', index: 'home', className: 'HomeController', create: async (dtp) => { return new HomeController(dtp); }, diff --git a/app/controllers/image.js b/app/controllers/image.js index 4d2b703..543f33f 100644 --- a/app/controllers/image.js +++ b/app/controllers/image.js @@ -135,7 +135,7 @@ class ImageController extends SiteController { } module.exports = { - logId: 'image', + logId: 'ctl:image', index: 'image', className: 'ImageController', create: async (dtp) => { return new ImageController(dtp); }, diff --git a/app/controllers/manifest.js b/app/controllers/manifest.js index a7a3880..51c2cad 100644 --- a/app/controllers/manifest.js +++ b/app/controllers/manifest.js @@ -64,7 +64,7 @@ class ManifestController extends SiteController { } module.exports = { - logId: 'manifest', + logId: 'ctl:manifest', index: 'manifest', className: 'ManifestController', create: async (dtp) => { return new ManifestController(dtp); }, diff --git a/app/controllers/newsletter.js b/app/controllers/newsletter.js index c45f32e..419eff6 100644 --- a/app/controllers/newsletter.js +++ b/app/controllers/newsletter.js @@ -92,7 +92,7 @@ class NewsletterController extends SiteController { } module.exports = { - logId: 'newsletter', + logId: 'ctl:newsletter', index: 'newsletter', className: 'NewsletterController', create: async (dtp) => { return new NewsletterController(dtp); }, diff --git a/app/controllers/newsroom.js b/app/controllers/newsroom.js index a1b05dc..ad62f65 100644 --- a/app/controllers/newsroom.js +++ b/app/controllers/newsroom.js @@ -165,7 +165,7 @@ class NewsroomController extends SiteController { } module.exports = { - logId: 'newsroom', + logId: 'ctl:newsroom', index: 'newsroom', className: 'NewsroomController', create: (dtp) => { return new NewsroomController(dtp); }, diff --git a/app/controllers/notification.js b/app/controllers/notification.js index 3614c38..fbca3d0 100644 --- a/app/controllers/notification.js +++ b/app/controllers/notification.js @@ -72,7 +72,7 @@ class NotificationController extends SiteController { } module.exports = { - logId: 'notification', + logId: 'ctl:notification', index: 'notification', className: 'NotificationController', create: async (dtp) => { return new NotificationController(dtp); }, diff --git a/app/controllers/user.js b/app/controllers/user.js index cb450b4..4e54dba 100644 --- a/app/controllers/user.js +++ b/app/controllers/user.js @@ -644,7 +644,7 @@ class UserController extends SiteController { } module.exports = { - logId: 'user', + logId: 'ctl:user', index: 'user', className: 'UserController', create: async (dtp) => { return new UserController(dtp); }, diff --git a/app/controllers/welcome.js b/app/controllers/welcome.js index 4a9499e..3b0b401 100644 --- a/app/controllers/welcome.js +++ b/app/controllers/welcome.js @@ -120,7 +120,7 @@ class WelcomeController extends SiteController { } module.exports = { - logId: 'welcome', + logId: 'ctl:welcome', index: 'welcome', className: 'WelcomeController', create: async (dtp) => { return new WelcomeController(dtp); }, diff --git a/app/services/announcement.js b/app/services/announcement.js index aa7aee6..02e8277 100644 --- a/app/services/announcement.js +++ b/app/services/announcement.js @@ -116,7 +116,7 @@ class AnnouncementService extends SiteService { } module.exports = { - logId: 'announcement', + logId: 'svc:announcement', index: 'announcement', className: 'AnnouncementService', create: (dtp) => { return new AnnouncementService(dtp); }, diff --git a/app/services/attachment.js b/app/services/attachment.js index a4c407c..309e00f 100644 --- a/app/services/attachment.js +++ b/app/services/attachment.js @@ -211,7 +211,7 @@ class AttachmentService extends SiteService { } module.exports = { - logId: 'attachment', + logId: 'svc:attachment', index: 'attachment', className: 'AttachmentService', create: (dtp) => { return new AttachmentService(dtp); }, diff --git a/app/services/cache.js b/app/services/cache.js index 9827291..8da2605 100644 --- a/app/services/cache.js +++ b/app/services/cache.js @@ -57,7 +57,7 @@ class CacheService extends SiteService { } module.exports = { - logId: 'cache', + logId: 'svc:cache', index: 'cache', className: 'CacheService', create: (dtp) => { return new CacheService(dtp); }, diff --git a/app/services/chat.js b/app/services/chat.js index 77a7e7e..1c4a744 100644 --- a/app/services/chat.js +++ b/app/services/chat.js @@ -862,7 +862,7 @@ class ChatService extends SiteService { } module.exports = { - logId: 'chat', + logId: 'svc:chat', index: 'chat', className: 'ChatService', create: (dtp) => { return new ChatService(dtp); }, diff --git a/app/services/comment.js b/app/services/comment.js index aff2c11..0ea4158 100644 --- a/app/services/comment.js +++ b/app/services/comment.js @@ -350,7 +350,7 @@ class CommentService extends SiteService { } module.exports = { - logId: 'comment', + logId: 'svc:comment', index: 'comment', className: 'CommentService', create: (dtp) => { return new CommentService(dtp); }, diff --git a/app/services/content-report.js b/app/services/content-report.js index e239a76..59c2190 100644 --- a/app/services/content-report.js +++ b/app/services/content-report.js @@ -127,7 +127,7 @@ class ContentReportService extends SiteService { } module.exports = { - logId: 'content-report', + logId: 'svc:content-report', index: 'contentReport', className: 'ContentReportService', create: (dtp) => { return new ContentReportService(dtp); }, diff --git a/app/services/content-vote.js b/app/services/content-vote.js index bf65984..d5916eb 100644 --- a/app/services/content-vote.js +++ b/app/services/content-vote.js @@ -117,7 +117,7 @@ class ContentVoteService extends SiteService { } module.exports = { - logId: 'content-vote', + logId: 'svc:content-vote', index: 'contentVote', className: 'ContentVoteService', create: (dtp) => { return new ContentVoteService(dtp); }, diff --git a/app/services/core-node.js b/app/services/core-node.js index a543eac..1662673 100644 --- a/app/services/core-node.js +++ b/app/services/core-node.js @@ -803,7 +803,7 @@ class CoreNodeService extends SiteService { } module.exports = { - logId: 'core-node', + logId: 'svc:core-node', index: 'coreNode', className: 'CoreNodeService', create: (dtp) => { return new CoreNodeService(dtp); }, diff --git a/app/services/crypto.js b/app/services/crypto.js index b95f001..2325078 100644 --- a/app/services/crypto.js +++ b/app/services/crypto.js @@ -58,7 +58,7 @@ class CryptoService extends SiteService { } module.exports = { - logId: 'crypto', + logId: 'svc:crypto', index: 'crypto', className: 'CryptoService', create: (dtp) => { return new CryptoService(dtp); }, diff --git a/app/services/csrf-token.js b/app/services/csrf-token.js index b253704..3594074 100644 --- a/app/services/csrf-token.js +++ b/app/services/csrf-token.js @@ -76,7 +76,7 @@ class CsrfTokenService extends SiteService { } module.exports = { - logId: 'csrf-token', + logId: 'svc:csrf-token', index: 'csrfToken', className: 'CsrfTokenService', create: (dtp) => { return new CsrfTokenService(dtp); }, diff --git a/app/services/dashboard.js b/app/services/dashboard.js index cdf4507..7d7d6a7 100644 --- a/app/services/dashboard.js +++ b/app/services/dashboard.js @@ -270,7 +270,7 @@ class DashboardService extends SiteService { } module.exports = { - logId: 'dashboard', + logId: 'svc:dashboard', index: 'dashboard', className: 'DashboardService', create: (dtp) => { return new DashboardService(dtp); }, diff --git a/app/services/display-engine.js b/app/services/display-engine.js index 17feb93..bca2993 100644 --- a/app/services/display-engine.js +++ b/app/services/display-engine.js @@ -150,7 +150,7 @@ class DisplayEngineService extends SiteService { } module.exports = { - logId: 'display-engine', + logId: 'svc:display-engine', index: 'displayEngine', className: 'DisplayEngineService', create: (dtp) => { return new DisplayEngineService(dtp); }, diff --git a/app/services/email.js b/app/services/email.js index 3ca513a..76b6364 100644 --- a/app/services/email.js +++ b/app/services/email.js @@ -171,7 +171,7 @@ class EmailService extends SiteService { } module.exports = { - logId: 'email', + logId: 'svc:email', index: 'email', className: 'EmailService', create: (dtp) => { return new EmailService(dtp); }, diff --git a/app/services/feed.js b/app/services/feed.js index 2ca64e9..2586af4 100644 --- a/app/services/feed.js +++ b/app/services/feed.js @@ -176,7 +176,7 @@ class FeedService extends SiteService { } module.exports = { - logId: 'feed', + logId: 'svc:feed', index: 'feed', className: 'FeedService', create: (dtp) => { return new FeedService(dtp); }, diff --git a/app/services/hive.js b/app/services/hive.js index 509f464..ef49931 100644 --- a/app/services/hive.js +++ b/app/services/hive.js @@ -330,7 +330,7 @@ class HiveService extends SiteService { } module.exports = { - logId: 'hive', + logId: 'svc:hive', index: 'hive', className: 'HiveService', create: (dtp) => { return new HiveService(dtp); }, diff --git a/app/services/host-cache.js b/app/services/host-cache.js index 6b02438..d8d7d39 100644 --- a/app/services/host-cache.js +++ b/app/services/host-cache.js @@ -97,7 +97,7 @@ class HostCacheService extends SiteService { } module.exports = { - logId: 'host-cache', + logId: 'svc:host-cache', index: 'hostCache', className: 'HostCacheService', create: (dtp) => { return new HostCacheService(dtp); }, diff --git a/app/services/image.js b/app/services/image.js index 1321f9f..66686a3 100644 --- a/app/services/image.js +++ b/app/services/image.js @@ -320,7 +320,7 @@ class ImageService extends SiteService { } module.exports = { - logId: 'image', + logId: 'svc:image', index: 'image', className: 'ImageService', create: (dtp) => { return new ImageService(dtp); }, diff --git a/app/services/job-queue.js b/app/services/job-queue.js index e825ba9..7018c1a 100644 --- a/app/services/job-queue.js +++ b/app/services/job-queue.js @@ -62,7 +62,7 @@ class JobQueueService extends SiteService { } module.exports = { - logId: 'job-queue', + logId: 'svc:job-queue', index: 'jobQueue', className: 'JobQueueService', create: (dtp) => { return new JobQueueService(dtp); }, diff --git a/app/services/limiter.js b/app/services/limiter.js index 6a88ed1..80ad38b 100644 --- a/app/services/limiter.js +++ b/app/services/limiter.js @@ -69,7 +69,7 @@ class LimiterService extends SiteService { } module.exports = { - logId: 'limiter', + logId: 'svc:limiter', index: 'limiter', className: 'LimiterService', create: (dtp) => { return new LimiterService(dtp); }, diff --git a/app/services/log.js b/app/services/log.js index 75286b6..e910b6d 100644 --- a/app/services/log.js +++ b/app/services/log.js @@ -38,7 +38,7 @@ class SystemLogService extends SiteService { } module.exports = { - logId: 'log', + logId: 'svc:log', index: 'log', className: 'SystemLogService', create: (dtp) => { return new SystemLogService(dtp); }, diff --git a/app/services/logan.js b/app/services/logan.js index 338dad0..87df2d6 100644 --- a/app/services/logan.js +++ b/app/services/logan.js @@ -68,7 +68,7 @@ class LoganService extends SiteService { } module.exports = { - logId: 'logan', + logId: 'svc:logan', index: 'logan', className: 'LoganService', create: (dtp) => { return new LoganService(dtp); }, diff --git a/app/services/markdown.js b/app/services/markdown.js index d70f570..92b7aeb 100644 --- a/app/services/markdown.js +++ b/app/services/markdown.js @@ -32,7 +32,7 @@ class MarkdownService extends SiteService { } module.exports = { - logId: 'markdown', + logId: 'svc:markdown', index: 'markdown', className: 'MarkdownService', create: (dtp) => { return new MarkdownService(dtp); }, diff --git a/app/services/media.js b/app/services/media.js index 6306618..67f4daa 100644 --- a/app/services/media.js +++ b/app/services/media.js @@ -94,7 +94,7 @@ class MediaService extends SiteService { } module.exports = { - logId: 'media', + logId: 'svc:media', index: 'media', className: 'MediaService', create: (dtp) => { return new MediaService(dtp); }, diff --git a/app/services/minio.js b/app/services/minio.js index bbaf5e9..da9258d 100644 --- a/app/services/minio.js +++ b/app/services/minio.js @@ -97,7 +97,7 @@ class MinioService extends SiteService { } module.exports = { - logId: 'minio', + logId: 'svc:minio', index: 'minio', className: 'MinioService', create: (dtp) => { return new MinioService(dtp); }, diff --git a/app/services/newsletter.js b/app/services/newsletter.js index 5c3647a..d730ba3 100644 --- a/app/services/newsletter.js +++ b/app/services/newsletter.js @@ -117,7 +117,7 @@ class NewsletterService extends SiteService { } module.exports = { - logId: 'newsletter', + logId: 'svc:newsletter', index: 'newsletter', className: 'NewsletterService', create: (dtp) => { return new NewsletterService(dtp); }, diff --git a/app/services/oauth2.js b/app/services/oauth2.js index b557df7..2bdd2bd 100644 --- a/app/services/oauth2.js +++ b/app/services/oauth2.js @@ -474,7 +474,7 @@ class OAuth2Service extends SiteService { } module.exports = { - logId: 'oauth2', + logId: 'svc:oauth2', index: 'oauth2', className: 'OAuth2Service', create: (dtp) => { return new OAuth2Service(dtp); }, diff --git a/app/services/otp-auth.js b/app/services/otp-auth.js index 8afaff5..e4b5f9b 100644 --- a/app/services/otp-auth.js +++ b/app/services/otp-auth.js @@ -238,7 +238,7 @@ class OtpAuthService extends SiteService { } module.exports = { - logId: 'otp-auth', + logId: 'svc:otp-auth', index: 'otpAuth', className: 'OtpAuthService', create: (dtp) => { return new OtpAuthService(dtp); }, diff --git a/app/services/phone.js b/app/services/phone.js index c6b91bf..3ae21c0 100644 --- a/app/services/phone.js +++ b/app/services/phone.js @@ -55,7 +55,7 @@ class PhoneService extends SiteService { } module.exports = { - logId: 'phone', + logId: 'svc:phone', index: 'phone', className: 'PhoneService', create: (dtp) => { return new PhoneService(dtp); }, diff --git a/app/services/resource.js b/app/services/resource.js index 95704c0..167d8c7 100644 --- a/app/services/resource.js +++ b/app/services/resource.js @@ -118,7 +118,7 @@ class ResourceService extends SiteService { } module.exports = { - logId: 'resource', + logId: 'svc:resource', index: 'resource', className: 'ResourceService', create: (dtp) => { return new ResourceService(dtp); }, diff --git a/app/services/session.js b/app/services/session.js index 18545f2..2767dae 100644 --- a/app/services/session.js +++ b/app/services/session.js @@ -110,7 +110,7 @@ class SessionService extends SiteService { } module.exports = { - logId: 'session', + logId: 'svc:session', index: 'session', className: 'SessionService', create: (dtp) => { return new SessionService(dtp); }, diff --git a/app/services/sms.js b/app/services/sms.js index 6a15fd1..8496839 100644 --- a/app/services/sms.js +++ b/app/services/sms.js @@ -47,7 +47,7 @@ class SmsService extends SiteService { } module.exports = { - logId: 'sms', + logId: 'svc:sms', index: 'sms', className: 'SmsService', create: (dtp) => { return new SmsService(dtp); }, diff --git a/app/services/sticker.js b/app/services/sticker.js index 713b105..6d6fdd8 100644 --- a/app/services/sticker.js +++ b/app/services/sticker.js @@ -11,7 +11,7 @@ const mongoose = require('mongoose'); const Sticker = mongoose.model('Sticker'); const User = mongoose.model('User'); -const { SiteService, SiteError, SiteAsync } = require('../../lib/site-lib'); +const { SiteService, SiteError } = require('../../lib/site-lib'); const MAX_CHANNEL_STICKERS = 50; const MAX_USER_STICKERS = 10; @@ -144,18 +144,42 @@ class StickerService extends SiteService { await Sticker.updateOne({ _id: sticker._id }, { $set: { status } }); } + /** + * Fetch and populate an Array of Sticker documents matching the input slugs. + * + * The returned Array may be smaller than the input Array (or empty) if some + * or none of the stickers have been deleted or simply don't exist. + * + * @param {Array} slugs an Array of sticker slugs + * @returns Array of populated matching Sticker documents + */ async resolveStickerSlugs (slugs) { - const stickers = [ ]; - await SiteAsync.each(slugs, async (slug) => { - const sticker = await Sticker.findOne({ slug: slug }); - if (!sticker) { - return; - } - stickers.push(sticker); - }); + const stickers = await Sticker + .find({ slug: { $in: slugs } }) + .populate(this.populateSticker) + .lean(); return stickers; } + /** + * Convert an array of sticker slugs to an array of sticker _id values. This + * is used during chat message ingest where the whole populated sticker just + * isn't needed and is all discarded. + * + * The returned Array may be smaller than the input Array (or empty) if some + * or none of the stickers have been deleted or simply don't exist. + * + * @param {Array} slugs an Array of sticker slugs + * @returns an Array of sticker IDs + */ + async resolveStickerSlugIds (slugs) { + const stickers = await Sticker + .find({ slug: { $in: slugs } }) + .select('_id') + .lean(); + return stickers.map((sticker) => sticker._id); + } + async removeSticker (sticker) { const stickerId = sticker._id; this.log.info('creating sticker delete job', { stickerId }); @@ -208,7 +232,7 @@ class StickerService extends SiteService { } module.exports = { - logId: 'sticker', + logId: 'svc:sticker', index: 'sticker', className: 'StickerService', create: (dtp) => { return new StickerService(dtp); }, diff --git a/app/services/user-notification.js b/app/services/user-notification.js index 733dee7..d528137 100644 --- a/app/services/user-notification.js +++ b/app/services/user-notification.js @@ -135,7 +135,7 @@ class UserNotificationService extends SiteService { } module.exports = { - logId: 'user-notification', + logId: 'svc:user-notification', index: 'userNotification', className: 'UserNotificationService', create: (dtp) => { return new UserNotificationService(dtp); }, diff --git a/app/services/user.js b/app/services/user.js index 62b976b..fcc7af8 100644 --- a/app/services/user.js +++ b/app/services/user.js @@ -972,7 +972,7 @@ class UserService extends SiteService { } module.exports = { - logId: 'user', + logId: 'svc:user', index: 'user', className: 'UserService', create: (dtp) => { return new UserService(dtp); }, diff --git a/app/workers/chat.js b/app/workers/chat.js index dba6236..2e981ca 100644 --- a/app/workers/chat.js +++ b/app/workers/chat.js @@ -17,7 +17,7 @@ module.pkg = require(path.resolve(__dirname, '..', '..', 'package.json')); module.config = { environment: process.env.NODE_ENV, root: module.rootPath, - component: { logId: 'chat-worker', index: 'chatWorker', className: 'ChatWorker' }, + component: { logId: 'wrk:chat', index: 'chatWorker', className: 'ChatWorker' }, }; module.config.site = require(path.join(module.rootPath, 'config', 'site')); diff --git a/app/workers/chat/job/chat-room-clear.js b/app/workers/chat/job/chat-room-clear.js index ec6e56e..2c43580 100644 --- a/app/workers/chat/job/chat-room-clear.js +++ b/app/workers/chat/job/chat-room-clear.js @@ -16,7 +16,7 @@ class ChatRoomClearJob extends SiteWorkerProcess { static get COMPONENT ( ) { return { - logId: 'chat-room-clear-job', + logId: 'wrk:chat:room-clear:job', index: 'charRoomClearJob', className: 'ChatRoomClearJob', }; diff --git a/app/workers/chat/job/chat-room-delete.js b/app/workers/chat/job/chat-room-delete.js index 225761d..37ca2e5 100644 --- a/app/workers/chat/job/chat-room-delete.js +++ b/app/workers/chat/job/chat-room-delete.js @@ -15,18 +15,12 @@ const EmojiReaction = mongoose.model('EmojiReaction'); const { SiteWorkerProcess } = require(path.join(__dirname, '..', '..', '..', '..', 'lib', 'site-lib')); -/** - * DTP Core Chat sticker processor can receive requests to ingest and delete - * stickers to be executed as background jobs in a queue. This processor - * attaches to the `media` queue and registers processors for `sticker-ingest` - * and `sticker-delete`. - */ class ChatRoomDeleteJob extends SiteWorkerProcess { static get COMPONENT ( ) { return { - logId: 'chat-room-processor', - index: 'chatRoomProcessor', + logId: 'wrk:chat:room-delete:job', + index: 'chatRoomDeleteJob', className: 'ChatRoomDeleteJob', }; } diff --git a/app/workers/host-services.js b/app/workers/host-services.js index 664386b..d8766bd 100644 --- a/app/workers/host-services.js +++ b/app/workers/host-services.js @@ -34,7 +34,7 @@ module.config = { root: module.rootPath, site: require(path.join(module.rootPath, 'config', 'site')), http: require(path.join(module.rootPath, 'config', 'http')), - component: { logId: 'host-services-worker', index: 'hostServicesWorker', className: 'HostServicesWorker' }, + component: { logId: 'wrk:host-services', index: 'hostServicesWorker', className: 'HostServicesWorker' }, }; module.log = new SiteLog(module, module.config.component); diff --git a/app/workers/logan.js b/app/workers/logan.js index 5173da7..65980ff 100644 --- a/app/workers/logan.js +++ b/app/workers/logan.js @@ -16,7 +16,7 @@ module.config = { environment: process.env.NODE_ENV, root: module.rootPath, site: require(path.join(module.rootPath, 'config', 'site')), - component: { logId: 'logan-site-worker', index: 'LoganSiteWorker', className: 'LoganSiteWorker' }, + component: { logId: 'wrk:logan-site', index: 'loganSite', className: 'LoganSiteWorker' }, }; class LoganSiteWorker extends SiteWorker { diff --git a/app/workers/media.js b/app/workers/media.js index 06e12e6..1f768e3 100644 --- a/app/workers/media.js +++ b/app/workers/media.js @@ -15,7 +15,7 @@ module.pkg = require(path.resolve(__dirname, '..', '..', 'package.json')); module.config = { environment: process.env.NODE_ENV, root: path.resolve(__dirname, '..', '..'), - component: { logId: 'media-worker', index: 'mediaWorker', className: 'MediaWorker' }, + component: { logId: 'wrk:media', index: 'media', className: 'MediaWorker' }, }; /** diff --git a/app/workers/media/job/attachment-delete.js b/app/workers/media/job/attachment-delete.js index 931355a..9985898 100644 --- a/app/workers/media/job/attachment-delete.js +++ b/app/workers/media/job/attachment-delete.js @@ -15,7 +15,7 @@ class AttachmentDeleteJob extends SiteWorkerProcess { static get COMPONENT ( ) { return { - logId: 'attachment-delete-job', + logId: 'wrk:chat:attachment-delete:job', index: 'attachmentDeleteJob', className: 'AttachmentDeleteJob', }; diff --git a/app/workers/media/job/attachment-ingest.js b/app/workers/media/job/attachment-ingest.js index ab77163..1626ecf 100644 --- a/app/workers/media/job/attachment-ingest.js +++ b/app/workers/media/job/attachment-ingest.js @@ -19,7 +19,7 @@ class AttachmentIngestJob extends SiteWorkerProcess { static get COMPONENT ( ) { return { - logId: 'attachment-ingest-job', + logId: 'wrk:chat:attachment-ingest:job', index: 'attachmentIngestJob', className: 'AttachmentIngestJob', }; diff --git a/app/workers/media/job/sticker-delete.js b/app/workers/media/job/sticker-delete.js index d9b5461..cb71f91 100644 --- a/app/workers/media/job/sticker-delete.js +++ b/app/workers/media/job/sticker-delete.js @@ -15,7 +15,7 @@ class StickerDeleteJob extends SiteWorkerProcess { static get COMPONENT ( ) { return { - logId: 'sticker-delete-job', + logId: 'wrk:chat:sticker-delete:job', index: 'stickerDeleteJob', className: 'StickerDeleteJob', }; diff --git a/app/workers/media/job/sticker-ingest.js b/app/workers/media/job/sticker-ingest.js index 6ec4ddd..3f23473 100644 --- a/app/workers/media/job/sticker-ingest.js +++ b/app/workers/media/job/sticker-ingest.js @@ -20,7 +20,7 @@ class StickerIngestJob extends SiteWorkerProcess { static get COMPONENT ( ) { return { - logId: 'sticker-ingest-job', + logId: 'wrk:chat:sticker-ingest:job', index: 'stickerIngestJob', className: 'StickerIngestJob', }; diff --git a/app/workers/media/job/webpage-screenshot.js b/app/workers/media/job/webpage-screenshot.js index 7c18cb0..7690629 100644 --- a/app/workers/media/job/webpage-screenshot.js +++ b/app/workers/media/job/webpage-screenshot.js @@ -17,7 +17,7 @@ class WebpageScreenshotJob extends SiteWorkerProcess { static get COMPONENT ( ) { return { - logId: 'webpage-screenshot-job', + logId: 'wrk:chat:webpage-screenshot:job', index: 'webpageScreenshotJob', className: 'WebpageScreenshotJob', }; diff --git a/app/workers/newsletter.js b/app/workers/newsletter.js index a004a22..11fc090 100644 --- a/app/workers/newsletter.js +++ b/app/workers/newsletter.js @@ -12,7 +12,7 @@ const { SiteWorker, SiteLog } = require(path.join(__dirname, '..', '..', 'lib', module.pkg = require(path.resolve(__dirname, '..', '..', 'package.json')); module.config = { root: path.resolve(__dirname, '..', '..'), - component: { logId: 'newsletter-worker', index: 'newsletterWorker', className: 'NewsletterWorker' }, + component: { logId: 'wrk:newsletter', index: 'newsletter', className: 'NewsletterWorker' }, }; class NewsletterWorker extends SiteWorker { diff --git a/app/workers/newsletter/job/email-send.js b/app/workers/newsletter/job/email-send.js index 04d24d6..fc8b63e 100644 --- a/app/workers/newsletter/job/email-send.js +++ b/app/workers/newsletter/job/email-send.js @@ -12,7 +12,7 @@ class NewsletterEmailSendJob extends SiteWorkerProcess { static get COMPONENT ( ) { return { - logId: 'newsletter-email-send-job', + logId: 'wrk:newsletter:email-send:job', index: 'newsletterEmailSendJob', className: 'NewsletterEmailSendJob', }; diff --git a/app/workers/newsletter/job/transmit.js b/app/workers/newsletter/job/transmit.js index f4acc08..c8e4f1b 100644 --- a/app/workers/newsletter/job/transmit.js +++ b/app/workers/newsletter/job/transmit.js @@ -17,7 +17,7 @@ class NewsletterTransmitJob extends SiteWorkerProcess { static get COMPONENT ( ) { return { - logId: 'newsletter-transmit-job', + logId: 'wrk:newsletter:transmit:job', index: 'newsletterTransmitJob', className: 'NewsletterTransmitJob', }; diff --git a/app/workers/newsroom.js b/app/workers/newsroom.js index 6fa69e2..eaea87d 100644 --- a/app/workers/newsroom.js +++ b/app/workers/newsroom.js @@ -23,7 +23,7 @@ module.pkg = require(path.resolve(__dirname, '..', '..', 'package.json')); module.config = { environment: process.env.NODE_ENV, root: module.rootPath, - component: { logId: 'newsroom', index: 'newsroom', className: 'NewsroomWorker' }, + component: { logId: 'wrk:newsroom', index: 'newsroom', className: 'NewsroomWorker' }, }; module.config.site = require(path.join(module.rootPath, 'config', 'site')); diff --git a/app/workers/newsroom/cron/update-feeds.js b/app/workers/newsroom/cron/update-feeds.js index 3cb03b3..7f10e23 100644 --- a/app/workers/newsroom/cron/update-feeds.js +++ b/app/workers/newsroom/cron/update-feeds.js @@ -17,7 +17,7 @@ class UpdateFeedsCron extends SiteWorkerProcess { static get COMPONENT ( ) { return { - logId: 'update-feeds-cron', + logId: 'wrk:newsroom:update-feeds:cron', index: 'updateFeeds', className: 'UpdateFeedsCron', }; diff --git a/app/workers/newsroom/job/update-feed.js b/app/workers/newsroom/job/update-feed.js index 4e0dcbb..03c13a0 100644 --- a/app/workers/newsroom/job/update-feed.js +++ b/app/workers/newsroom/job/update-feed.js @@ -12,7 +12,7 @@ class UpdateFeedJob extends SiteWorkerProcess { static get COMPONENT ( ) { return { - logId: 'newsroom-update-feed-job', + logId: 'wrk:newsroom:update-feed:job', index: 'newsroomUpdateFeedJob', className: 'UpdateFeedJob', }; diff --git a/app/workers/reeeper.js b/app/workers/reeeper.js index 18d6dfd..62bb2ad 100644 --- a/app/workers/reeeper.js +++ b/app/workers/reeeper.js @@ -19,7 +19,7 @@ module.pkg = require(path.resolve(__dirname, '..', '..', 'package.json')); module.config = { environment: process.env.NODE_ENV, root: module.rootPath, - component: { logId: 'reeeper', index: 'reeeper', className: 'ReeeperWorker' }, + component: { logId: 'wrk:reeeper', index: 'reeeper', className: 'ReeeperWorker' }, }; module.config.site = require(path.join(module.rootPath, 'config', 'site')); diff --git a/app/workers/reeeper/cron/expire-announcements.js b/app/workers/reeeper/cron/expire-announcements.js index 144302a..837830b 100644 --- a/app/workers/reeeper/cron/expire-announcements.js +++ b/app/workers/reeeper/cron/expire-announcements.js @@ -29,7 +29,7 @@ class ExpiredAnnouncementsCron extends SiteWorkerProcess { static get COMPONENT ( ) { return { - logId: 'expired-announcements-cron', + logId: 'wrk:chat:expired-announcements:cron', index: 'expiredAnnouncementsCron', className: 'ExpiredAnnouncementsCron', }; diff --git a/app/workers/reeeper/cron/expire-crashed-hosts.js b/app/workers/reeeper/cron/expire-crashed-hosts.js index 3edb617..17ea9a1 100644 --- a/app/workers/reeeper/cron/expire-crashed-hosts.js +++ b/app/workers/reeeper/cron/expire-crashed-hosts.js @@ -28,7 +28,7 @@ class CrashedHostsCron extends SiteWorkerProcess { static get COMPONENT ( ) { return { - logId: 'crashed-hosts-cron', + logId: 'wrk:reeeper:crashed-hosts:cron', index: 'crashedHostsCron', className: 'CrashedHostsCron', }; diff --git a/app/workers/reeeper/job/archive-user-local.js b/app/workers/reeeper/job/archive-user-local.js index 073c8cc..91d9da2 100644 --- a/app/workers/reeeper/job/archive-user-local.js +++ b/app/workers/reeeper/job/archive-user-local.js @@ -30,7 +30,7 @@ class ArchiveUserLocalJob extends SiteWorkerProcess { static get COMPONENT ( ) { return { - logId: 'archive-user-local-job', + logId: 'wrk:reeeper:archive-user-local:job', index: 'archiveUserLocalJob', className: 'ArchiveUserLocalJob', }; diff --git a/client/js/index-admin.js b/client/js/index-admin.js index 6324dd1..48aed4d 100644 --- a/client/js/index-admin.js +++ b/client/js/index-admin.js @@ -4,7 +4,7 @@ 'use strict'; -const DTP_COMPONENT = { name: 'Site Admin', slug: 'site-admin' }; +const DTP_COMPONENT = { logId: 'site-admin-index', index: 'siteAdminIndex', className: 'SiteAdminIndex' }; const dtp = window.dtp = window.dtp || { }; dtp.admin = dtp.admin || { }; @@ -13,11 +13,9 @@ import DtpSiteAdminApp from './site-admin-app.js'; import DtpWebLog from 'dtp/dtp-log.js'; window.addEventListener('load', async ( ) => { - // application console log dtp.admin.log = new DtpWebLog(DTP_COMPONENT); - dtp.adminApp = new DtpSiteAdminApp(dtp.user); - dtp.admin.log.debug('load', 'dispatching load event'); + dtp.admin.log.debug('load', 'dispatching admin load event'); window.dispatchEvent(new Event('dtp-load-admin')); }); \ No newline at end of file diff --git a/client/js/index.js b/client/js/index.js index 3288abe..362587e 100644 --- a/client/js/index.js +++ b/client/js/index.js @@ -4,13 +4,12 @@ 'use strict'; -const DTP_COMPONENT = { name: 'Site', slug: 'site' }; +const DTP_COMPONENT = { logId: 'site-index', index: 'siteIndex', className: 'SiteIndex' }; const dtp = window. dtp = window.dtp || { }; import DtpSiteApp from './site-app.js'; import DtpWebLog from 'dtp/dtp-log.js'; -// import UIkit from 'uikit'; /** * Monkeypatch to count characters instead of .length's code point count. diff --git a/client/js/site-admin-app.js b/client/js/site-admin-app.js index 6ba76b5..4c65a4b 100644 --- a/client/js/site-admin-app.js +++ b/client/js/site-admin-app.js @@ -4,7 +4,7 @@ 'use strict'; -const DTP_COMPONENT = { name: 'Site Admin', slug: 'site-admin-app' }; +const DTP_COMPONENT = { logId: 'site-admin-app', index: 'siteAdminApp', className: 'SiteAdminApp' }; const dtp = window.dtp = window.dtp || { }; const GRID_COLOR = '#a0a0a0'; @@ -25,7 +25,7 @@ import numeral from 'numeral'; import UIkit from 'uikit'; // import UIkit from 'uikit'; -export default class DtpSiteAdminHostStatsApp extends DtpApp { +export default class DtpSiteAdminApp extends DtpApp { constructor (user) { super(DTP_COMPONENT, user); @@ -461,4 +461,4 @@ export default class DtpSiteAdminHostStatsApp extends DtpApp { } } -dtp.DtpSiteAdminHostStatsApp = DtpSiteAdminHostStatsApp; \ No newline at end of file +dtp.DtpSiteAdminApp = DtpSiteAdminApp; \ No newline at end of file diff --git a/client/js/site-app.js b/client/js/site-app.js index b4711ac..7becf3c 100644 --- a/client/js/site-app.js +++ b/client/js/site-app.js @@ -4,7 +4,7 @@ 'use strict'; -const DTP_COMPONENT = { name: 'Site App', slug: 'site-app' }; +const DTP_COMPONENT = { logId: 'site-app', index: 'siteApp', className: 'DtpSiteApp' }; const dtp = window.dtp = window.dtp || { }; import DtpApp from 'dtp/dtp-app.js'; diff --git a/client/js/site-chat.js b/client/js/site-chat.js index 23af616..aa06147 100644 --- a/client/js/site-chat.js +++ b/client/js/site-chat.js @@ -4,7 +4,7 @@ 'use strict'; -const DTP_COMPONENT = { name: 'Site Chat', slug: 'site-chat' }; +const DTP_COMPONENT = { logId: 'site-chat', index: 'siteChat', className: 'DtpSiteChat' }; const dtp = window.dtp = window.dtp || { }; // jshint ignore:line const EMOJI_EXPLOSION_DURATION = 8000; diff --git a/client/js/site-comments.js b/client/js/site-comments.js index fe12dc3..e99b94c 100644 --- a/client/js/site-comments.js +++ b/client/js/site-comments.js @@ -14,7 +14,7 @@ export default class SiteComments { constructor (app) { this.app = app; - this.log = new DtpLog({ name: 'Site Comments', slug: 'comments' }); + this.log = new DtpLog({ logId: 'site-comments', index: 'siteComments', className: 'SiteComments' }); this.createEmojiPickers(); } diff --git a/client/js/site-reactions.js b/client/js/site-reactions.js index a6116fb..77da099 100644 --- a/client/js/site-reactions.js +++ b/client/js/site-reactions.js @@ -4,7 +4,7 @@ 'use strict'; -const DTP_COMPONENT = { name: 'Site Reactions', slug: 'site-reactions' }; +const DTP_COMPONENT = { logId: 'site-reactions', index: 'siteReactions', className: 'SiteReactions' }; const dtp = window.dtp = window.dtp || { }; // jshint ignore:line import DtpLog from 'dtp/dtp-log'; diff --git a/docs/samples/controller.js b/docs/samples/controller.js index 3a55f4d..1a845e7 100644 --- a/docs/samples/controller.js +++ b/docs/samples/controller.js @@ -90,8 +90,15 @@ class HomeController extends SiteController { } module.exports = { - slug: 'home', - name: 'home', - isHome: true, + logId: 'home', + index: 'home', + className: 'HomeController', create: async (dtp) => { return new HomeController(dtp); }, + + /* + * This attribute must exist and be set to true on your Home controller to + * ensure that it is started last. This matters for ensuring that your root + * route is registered to ExpressJS last. + */ + isHome: true, }; \ No newline at end of file diff --git a/docs/samples/service.js b/docs/samples/service.js index e7dc312..e620383 100644 --- a/docs/samples/service.js +++ b/docs/samples/service.js @@ -62,7 +62,8 @@ class SampleService extends SiteService { } module.exports = { + logId: 'svc:sample', name: 'sample', - slug: 'sample', + className: 'SampleService', create: (dtp) => { return new SampleService(dtp); }, }; \ No newline at end of file diff --git a/docs/samples/worker.js b/docs/samples/worker.js index d3c725c..5240c32 100644 --- a/docs/samples/worker.js +++ b/docs/samples/worker.js @@ -33,7 +33,7 @@ class SampleWorker extends SiteWorker { try { module.rootPath = path.resolve(__dirname, '..', '..'); module.pkg = require(path.resolve(__dirname, '..', '..', 'package.json')); - module.component = { name: 'theWorkerName', slug: 'the-worker-name' }; + module.component = { logId: 'wrk:sample', index: 'sampleWorker', className: 'SampleWorker' }; module.config = { environment: process.env.NODE_ENV, diff --git a/docs/services.md b/docs/services.md index 2cb68c6..eb3cebf 100644 --- a/docs/services.md +++ b/docs/services.md @@ -33,8 +33,9 @@ class MyService extends SiteService { } module.exports = { - slug: 'my-service', - name: 'myService', + logId: 'my-service', + index: 'myService', + className: 'MyService', create: (dtp) => { return new MyService(dtp); }, }; ``` \ No newline at end of file diff --git a/dtp-media-engine.js b/dtp-media-engine.js index 4b0bad8..1c11398 100644 --- a/dtp-media-engine.js +++ b/dtp-media-engine.js @@ -16,7 +16,7 @@ const { SiteAsync, SiteCommon, SitePlatform, SiteLog } = require(path.join(__dir module.rootPath = __dirname; module.pkg = require(path.join(module.rootPath, 'package.json')); module.config = { - component: { name: 'dtpMediaEngine', slug: 'dtp-media-engine' }, + component: { logId: 'dtp-media-engine', index: 'dtpMediaEngine', className: 'DtpMediaEngine' }, root: module.rootPath, site: require(path.join(module.rootPath, 'config', 'site')), webRtcServer: [ @@ -33,7 +33,7 @@ module.log = new SiteLog(module, module.config.component); class MediaEngineWorker extends SiteCommon { constructor ( ) { - super(module, { name: 'dtpMediaWorker', slug: 'dtp-media-worker' }); + super(module, { logId: 'dtp-media-worker', index: 'dtpMediaWorker', className: 'MediaEngineWorker' }); this._id = mongoose.Types.ObjectId(); } diff --git a/lib/client/js/dtp-display-engine.js b/lib/client/js/dtp-display-engine.js index 0005dcc..18e6a5a 100644 --- a/lib/client/js/dtp-display-engine.js +++ b/lib/client/js/dtp-display-engine.js @@ -4,17 +4,17 @@ 'use strict'; -const DTP_COMPONENT = { name: 'Display Engine', slug: 'display-engine' }; - import UIkit from 'uikit'; import DtpLog from './dtp-log.js'; export default class DtpDisplayEngine { + static get COMPONENT ( ) { return { logId: 'display-engine', index: 'displayEngine', className: 'DisplayEngine' }; } + constructor (app) { this.app = app; this.processors = { }; - this.log = new DtpLog(DTP_COMPONENT); + this.log = new DtpLog(DtpDisplayEngine.DTP_COMPONENT); } /** diff --git a/lib/client/js/dtp-socket.js b/lib/client/js/dtp-socket.js index be63d47..bddaa12 100644 --- a/lib/client/js/dtp-socket.js +++ b/lib/client/js/dtp-socket.js @@ -4,19 +4,19 @@ 'use strict'; -const DTP_COMPONENT = { name: 'Socket', slug: 'socket' }; - window.dtp = window.dtp || { }; import DtpWebLog from './dtp-log.js'; export default class DtpWebSocket { + static get COMPONENT ( ) { return { logId: 'socket', index: 'socket', className: 'DtpWebSocket' }; } + constructor ( ) { this.isConnected = false; this.isAuthenticated = false; this.joinedChannels = { }; - this.log = new DtpWebLog(DTP_COMPONENT); + this.log = new DtpWebLog(DtpWebSocket.DTP_COMPONENT); } async connect (options) { diff --git a/lib/site-worker-process.js b/lib/site-worker-process.js index 5d5ac46..57ac5ff 100644 --- a/lib/site-worker-process.js +++ b/lib/site-worker-process.js @@ -15,7 +15,7 @@ const { SiteCommon } = require(path.join(__dirname, 'site-common')); * Your derived class must implement a static getter for COMPONENT as follows: * * ``` - * static get COMPONENT ( ) { return { name: '', slug: '' }; } + * static get COMPONENT ( ) { return { logId: '', name: '', className: '' }; } * ``` * * It must pass that object to this constructor (super) along with the worker diff --git a/update-deps.js b/update-deps.js index a81ac2e..400ed3f 100644 --- a/update-deps.js +++ b/update-deps.js @@ -16,7 +16,7 @@ module.pkg = require(path.join(module.rootPath, 'package.json')); module.pinnedPackages = require(path.join(module.rootPath, 'config', 'pinned-packages')); module.config = { - component: { name: 'Webapp Dependency Updater', slug: 'webapp-update-deps' }, + component: { logId: 'webapp-update-deps', name: 'dtpUpdateDeps', className: 'DtpUpdateDeps' }, }; module.log = new SiteLog(module, module.config.component);