Skip to content
Open
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ All notable changes to the Zlux Server Framework package will be documented in t
This repo is part of the app-server Zowe Component, and the change logs here may appear on Zowe.org in that section.

## 3.4.0
- Enhancement: app-server log messages have use local timestamps instead of UTC timestamps by setting Zowe YAML configuration property `zowe.logging.timezone: local` which will take system settings into consideration for determining the right timezone to use. ([#572](https://github.com/zowe/zlux-server-framework/pull/572))
- Bugfix: Fix TN3270 and VT terminals not appearing in the Zowe Desktop when using AT-TLS by adding a workaround for an AT-TLS CORS error between the gateway and App Server where CORS metadata has been added to the eureka registration ([#617](https://github.com/zowe/zlux-server-framework/pull/617))
- Enhancement: Added components.app-server.enablePasswordChange parameter to the Zowe YAML configuration file for controlling visibility of the 'Change Password' option in the Zowe Desktop Personalization Panel. This value defaults to true, the prior behavior, when not present in the YAML. ([#616](https://github.com/zowe/zlux-server-framework/pull/616))

Expand All @@ -22,8 +23,7 @@ This repo is part of the app-server Zowe Component, and the change logs here may
- Bugfix: App-server could not register with discovery server when AT-TLS was enabled for app-server. (#580)

## 3.0.0
- Enhancement: Add ability for server to dynamically load plugin web content based on `entryPoint` specification in the
`pluginDefinition.json`
- Enhancement: Add ability for server to dynamically load plugin web content based on `entryPoint` specification in the `pluginDefinition.json`

## 2.18.1
- Bugfix: App-server could not register with discovery server when AT-TLS was enabled for app-server. (#581)
Expand Down
10 changes: 9 additions & 1 deletion lib/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,15 @@

if (!global.COM_RS_COMMON_LOGGER) {
const loggerFile = require('../../zlux-shared/src/logging/logger.js');
global.COM_RS_COMMON_LOGGER = new loggerFile.Logger();
let msOffset = undefined;
let timezonePreference = process.env.ZWE_zowe_logging_timezone;
if (timezonePreference) {
if (timezonePreference.toLowerCase() == 'local') {
let d = new Date();
msOffset = d.getTimezoneOffset() * 1000 * 60;
}
}
global.COM_RS_COMMON_LOGGER = new loggerFile.Logger(msOffset);
global.COM_RS_COMMON_LOGGER.addDestination(global.COM_RS_COMMON_LOGGER.makeDefaultDestination(true,true,true,true,true));
}

Expand Down
12 changes: 7 additions & 5 deletions utils/packaging-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@
const path = require('path');
const Promise = require('bluebird');
const fs = require('graceful-fs');
//assuming that this is file isnt being called from another that is already using the logger... else expect strange logs
const logging = require('../../zlux-shared/src/logging/logger.js');
const coreLogger = new logging.Logger();
//simple program, no need for logger names to be displayed
coreLogger.addDestination(coreLogger.makeDefaultDestination(true,false,false));
let coreLogger = global.COM_RS_COMMON_LOGGER;
if (!global.COM_RS_COMMON_LOGGER) { //app-server creates logger prior to this running, so don't create twice.
const logging = require('../../zlux-shared/src/logging/logger.js');
coreLogger = new logging.Logger();
//simple program, no need for logger names to be displayed
coreLogger.addDestination(coreLogger.makeDefaultDestination(true,false,false));
}

let logger;

Expand Down
Loading