@ps-aux/nodebup 0.9.4 → 0.9.5

package/lib/bup/pg/PgBackupController.js

@@ -115,7 +115,7 @@ let PgBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.m
         this.zip.unzipDir(zipFile, dir);
         this.fs.rmFile(zipFile);
         const outFile = this.fs.listFiles(dir)[0];
-        this.log.debug('Will run psql import from %s', outFile); // Don't forget that this itself might be run in docker
+        this.log.debug('Will run psql import from %s', outFile.str()); // Don't forget that this itself might be run in docker
         // therefore volume mounts are not usable (will apply to the location at host)
 
         this.sh.exec(`docker run --network host -i ` + `postgres:${version} ` + `psql ${pgUrl} -v ON_ERROR_STOP=0 < ${outFile.str()}`);

package/lib/ctx/ContextSymbols.js

@@ -3,13 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.TaskConfig_ = exports.StorageConfig_ = exports.Log_ = exports.Inputs_ = exports.AppConfig_ = void 0;
-const Log_ = Symbol.for('Log');
-exports.Log_ = Log_;
-const TaskConfig_ = Symbol.for('config.Tasks');
-exports.TaskConfig_ = TaskConfig_;
-const StorageConfig_ = Symbol.for('config.Storage');
-exports.StorageConfig_ = StorageConfig_;
+exports.Inputs_ = exports.AppConfig_ = void 0;
 const AppConfig_ = Symbol.for('config.app');
 exports.AppConfig_ = AppConfig_;
 const Inputs_ = Symbol.for('cmd.input');

package/lib/fs/Fs.test.js

@@ -7,12 +7,9 @@ var _Path = require("./path/Path");
 it.skip('withTmpDir', async () => {
   const fs = new _Fs.Fs(_Path.AbsPath.from(__dirname));
   await fs.inTmpDir('foo', async () => {
-    console.log('before');
     const wait = new Promise((res, rej) => {
       setTimeout(res, 1000);
     });
     await wait;
-    console.log('after');
   });
-  console.log('done');
 });

package/lib/log/logging.js

@@ -13,15 +13,18 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const level = process.env.NODEBUP_LOG_LEVEL || 'trace';
 const root = (0, _pino.default)({
   name: 'root',
-  transport: {
-    target: 'pino-pretty'
-  },
+  prettyPrint: true,
+  // - This will lead to problems with logging to stdout
+  // 1. No logging in Jest
+  // 2. Not logging when run as CLI app
+  // transport: { target: 'pino-pretty' },
   level
 });
 
 const makeLog = name => {
   return root.child({
-    name
+    name,
+    level
   });
 }; // TODO make type narrower
 

package/lib/log/logging.spec.js

@@ -0,0 +1,10 @@
+"use strict";
+
+var _logging = require("./logging");
+
+it('test', () => {
+  class A {}
+
+  const log = (0, _logging.classObjLog)(new A());
+  log.info('test');
+});

package/lib/storage/restic/ResticClient.js

@@ -31,7 +31,7 @@ class ResticClient {
     _defineProperty(this, "log", (0, _logging.classObjLog)(this));
 
     _defineProperty(this, "prepareRepo", () => {
-      this.log.info(`Preparing a restic repo at '${this.url}`);
+      this.log.info('Preparing a restic repo at %s', this.url);
       this.shell.exec(`restic init`, {
         env: this.env()
       });
@@ -44,7 +44,7 @@ class ResticClient {
     });
 
     _defineProperty(this, "backup", (cwd, from, tags = []) => {
-      this.log.debug(`Running backup for repo=${this.url}`);
+      this.log.debug('Running backup for repo=%s', this.url);
       let cmd = `restic backup ${from.str()}`;
       tags.forEach(t => {
         cmd += ` --tag=${t}`;
@@ -56,14 +56,14 @@ class ResticClient {
     });
 
     _defineProperty(this, "restore", (to, snapshotId = 'latest') => {
-      this.log.debug('Running restore  for repo=', this.url);
+      this.log.debug('Running restore  for repo=%s', this.url);
       this.shell.exec(`restic restore ${snapshotId} --target ${to.str()}`, {
         env: this.env()
       });
     });
 
     _defineProperty(this, "forget", () => {
-      this.log.debug(`Pruning repo=${this.url}`);
+      this.log.debug('Pruning repo=%s', this.url);
       const cfg = {
         hourly: 6,
         daily: 7,
@@ -77,7 +77,7 @@ class ResticClient {
     });
 
     _defineProperty(this, "snapshots", () => {
-      this.log.debug(`Listing snapshots of repo=${this.url}`);
+      this.log.debug('Listing snapshots of repo=%', this.url);
       const out = this.shell.execAndReturnString(`restic snapshots --json`, {
         env: this.env()
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ps-aux/nodebup",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "description": "",
   "module": "lib/index.js",
   "main": "lib/index.js",

package/lib/types.js

@@ -1,5 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});