neo4j-driver 4.3.0 → 4.3.1

package/lib/browser/neo4j-web.js

@@ -320,7 +320,7 @@ var BoltProtocol = /** @class */ (function () {
         var queued = this.queueObserverIfProtocolIsNotBroken(observer);
         if (queued) {
             if (this._log.isDebugEnabled()) {
-                this._log.debug(this + " C: " + message);
+                this._log.debug("C: " + message);
             }
             this.packer().packStruct(message.signature, message.fields.map(function (field) { return _this.packer().packable(field); }));
             this._chunker.messageBoundary();
@@ -1642,13 +1642,13 @@ var ResponseHandler = /** @class */ (function () {
         switch (msg.signature) {
             case RECORD:
                 if (this._log.isDebugEnabled()) {
-                    this._log.debug(this + " S: RECORD " + neo4j_driver_core_1.json.stringify(msg));
+                    this._log.debug("S: RECORD " + neo4j_driver_core_1.json.stringify(msg));
                 }
                 this._currentObserver.onNext(payload);
                 break;
             case SUCCESS:
                 if (this._log.isDebugEnabled()) {
-                    this._log.debug(this + " S: SUCCESS " + neo4j_driver_core_1.json.stringify(msg));
+                    this._log.debug("S: SUCCESS " + neo4j_driver_core_1.json.stringify(msg));
                 }
                 try {
                     var metadata = this._transformMetadata(payload);
@@ -1660,7 +1660,7 @@ var ResponseHandler = /** @class */ (function () {
                 break;
             case FAILURE:
                 if (this._log.isDebugEnabled()) {
-                    this._log.debug(this + " S: FAILURE " + neo4j_driver_core_1.json.stringify(msg));
+                    this._log.debug("S: FAILURE " + neo4j_driver_core_1.json.stringify(msg));
                 }
                 try {
                     var error = neo4j_driver_core_1.newError(payload.message, payload.code);
@@ -1675,7 +1675,7 @@ var ResponseHandler = /** @class */ (function () {
                 break;
             case IGNORED:
                 if (this._log.isDebugEnabled()) {
-                    this._log.debug(this + " S: IGNORED " + neo4j_driver_core_1.json.stringify(msg));
+                    this._log.debug("S: IGNORED " + neo4j_driver_core_1.json.stringify(msg));
                 }
                 try {
                     if (this._currentFailure && this._currentObserver.onError) {
@@ -5134,6 +5134,7 @@ var neo4j_driver_core_1 = require("neo4j-driver-core");
 var connection_1 = __importDefault(require("./connection"));
 var bolt_1 = __importDefault(require("../bolt"));
 var PROTOCOL_ERROR = neo4j_driver_core_1.error.PROTOCOL_ERROR;
+var Logger = neo4j_driver_core_1.internal.logger.Logger;
 var idGenerator = 0;
 /**
  * Crete new connection to the provided address. Returned connection is not connected.
@@ -5156,7 +5157,6 @@ function createChannelConnection(address, config, errorHandler, log, serversideR
         var createProtocol = function (conn) {
             return bolt_1.default.create({
                 version: version,
-                connection: conn,
                 channel: channel,
                 chunker: chunker,
                 dechunker: dechunker,
@@ -5164,7 +5164,7 @@ function createChannelConnection(address, config, errorHandler, log, serversideR
                 useBigInt: config.useBigInt,
                 serversideRouting: serversideRouting,
                 server: conn.server,
-                log: log,
+                log: conn.logger,
                 observer: {
                     onError: conn._handleFatalError.bind(conn),
                     onFailure: conn._resetOnFailure.bind(conn),
@@ -5211,7 +5211,7 @@ var ChannelConnection = /** @class */ (function (_super) {
         _this._disableLosslessIntegers = disableLosslessIntegers;
         _this._ch = channel;
         _this._chunker = chunker;
-        _this._log = log;
+        _this._log = createConnectionLogger(_this, log);
         _this._serversideRouting = serversideRouting;
         // connection from the database, returned in response for HELLO message and might not be available
         _this._dbConnectionId = null;
@@ -5224,7 +5224,7 @@ var ChannelConnection = /** @class */ (function (_super) {
         // Set to true on fatal errors, to get this out of connection pool.
         _this._isBroken = false;
         if (_this._log.isDebugEnabled()) {
-            _this._log.debug(_this + " created towards " + address);
+            _this._log.debug("created towards " + address);
         }
         return _this;
     }
@@ -5323,6 +5323,13 @@ var ChannelConnection = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(ChannelConnection.prototype, "logger", {
+        get: function () {
+            return this._log;
+        },
+        enumerable: false,
+        configurable: true
+    });
     /**
      * "Fatal" means the connection is dead. Only call this if something
      * happens that cannot be recovered from. This will lead to all subscribers
@@ -5334,7 +5341,7 @@ var ChannelConnection = /** @class */ (function (_super) {
         this._isBroken = true;
         this._error = this.handleAndTransformError(error, this._address);
         if (this._log.isErrorEnabled()) {
-            this._log.error(this + " experienced a fatal error " + neo4j_driver_core_1.json.stringify(this._error));
+            this._log.error("experienced a fatal error " + neo4j_driver_core_1.json.stringify(this._error));
         }
         this._protocol.notifyFatalError(this._error);
     };
@@ -5405,7 +5412,7 @@ var ChannelConnection = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         if (this._log.isDebugEnabled()) {
-                            this._log.debug(this + " closing");
+                            this._log.debug('closing');
                         }
                         if (this._protocol && this.isOpen()) {
                             // protocol has been initialized and this connection is healthy
@@ -5416,7 +5423,7 @@ var ChannelConnection = /** @class */ (function (_super) {
                     case 1:
                         _a.sent();
                         if (this._log.isDebugEnabled()) {
-                            this._log.debug(this + " closed");
+                            this._log.debug('closed');
                         }
                         return [2 /*return*/];
                 }
@@ -5436,6 +5443,17 @@ var ChannelConnection = /** @class */ (function (_super) {
     return ChannelConnection;
 }(connection_1.default));
 exports.default = ChannelConnection;
+/**
+ * Creates a log with the connection info as prefix
+ * @param {Connection} connection The connection
+ * @param {Logger} logger The logger
+ * @returns {Logger} The new logger with enriched messages
+ */
+function createConnectionLogger(connection, logger) {
+    return new Logger(logger._level, function (level, message) {
+        return logger._loggerFunction(level, connection + " " + message);
+    });
+}
 
 },{"../bolt":11,"../channel":26,"./connection":35,"neo4j-driver-core":58}],33:[function(require,module,exports){
 "use strict";
@@ -27751,7 +27769,7 @@ exports["default"] = void 0;
 // This is set up this way to keep the version in the code in
 // sync with the npm package version, and to allow the build
 // system to control version names at packaging time.
-var _default = '4.3.0';
+var _default = '4.3.1';
 exports["default"] = _default;
 
 },{}]},{},[296])(296)