@ps-aux/nodebup 0.9.3 → 0.9.5

package/lib/bup/aggregate/AggregateBackupController.js

@@ -17,30 +17,31 @@ var _inversify = require("inversify");
 
 var _ContextSymbols = require("../../ctx/ContextSymbols");
 
-var _AppLogger = require("../../log/AppLogger");
-
 var _Path = require("../../fs/path/Path");
 
 var _config = require("../../config");
 
 var _BackupStorageProvider = require("../../storage/BackupStorageProvider");
 
+var _logging = require("../../log/logging");
+
 var _dec, _dec2, _dec3, _dec4, _class;
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 let AggregateBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = function (target, key) {
-  return (0, _inversify.inject)(_ContextSymbols.AppConfig_)(target, undefined, 6);
-}, _dec3 = Reflect.metadata("design:type", Function), _dec4 = Reflect.metadata("design:paramtypes", [typeof _Gpg.Gpg === "undefined" ? Object : _Gpg.Gpg, typeof _SshKeyManager.SshKeyManager === "undefined" ? Object : _SshKeyManager.SshKeyManager, typeof _Fs.Fs === "undefined" ? Object : _Fs.Fs, typeof _FsSyncer.FsSyncer === "undefined" ? Object : _FsSyncer.FsSyncer, typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger, typeof _BackupStorageProvider.BackupStorageProvider === "undefined" ? Object : _BackupStorageProvider.BackupStorageProvider, typeof _config.Config === "undefined" ? Object : _config.Config]), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = class AggregateBackupController {
-  constructor(gpg, ssh, fs, fsSyncer, log, storageProvider, cfg) {
+  return (0, _inversify.inject)(_ContextSymbols.AppConfig_)(target, undefined, 5);
+}, _dec3 = Reflect.metadata("design:type", Function), _dec4 = Reflect.metadata("design:paramtypes", [typeof _Gpg.Gpg === "undefined" ? Object : _Gpg.Gpg, typeof _SshKeyManager.SshKeyManager === "undefined" ? Object : _SshKeyManager.SshKeyManager, typeof _Fs.Fs === "undefined" ? Object : _Fs.Fs, typeof _FsSyncer.FsSyncer === "undefined" ? Object : _FsSyncer.FsSyncer, typeof _BackupStorageProvider.BackupStorageProvider === "undefined" ? Object : _BackupStorageProvider.BackupStorageProvider, typeof _config.Config === "undefined" ? Object : _config.Config]), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = class AggregateBackupController {
+  constructor(gpg, ssh, fs, fsSyncer, storageProvider, cfg) {
     this.gpg = gpg;
     this.ssh = ssh;
     this.fs = fs;
     this.fsSyncer = fsSyncer;
-    this.log = log;
     this.storageProvider = storageProvider;
     this.cfg = cfg;
 
+    _defineProperty(this, "log", (0, _logging.classObjLog)(this));
+
     _defineProperty(this, "backup", async aggrName => {
       const aggrDir = this.cfg.pwd.resolve('.aggr');
       const aggr = this.cfg.aggregates.find(a => a.name === aggrName);
@@ -58,7 +59,7 @@ let AggregateBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = fu
         gpgKey.forEach(k => this.runGpgKeyTask(k, aggrDir));
         this.storageProvider.provide().store(aggrDir);
       } finally {
-        this.log.debug();
+        this.log.debug('Removing dir');
         this.fs.rmDir(aggrDir);
       }
     });

package/lib/bup/dir/DirBackupController.js

@@ -7,21 +7,22 @@ exports.DirBackupController = void 0;
 
 var _inversify = require("inversify");
 
-var _AppLogger = require("../../log/AppLogger");
-
 var _Path = require("../../fs/path/Path");
 
 var _BackupStorageProvider = require("../../storage/BackupStorageProvider");
 
+var _logging = require("../../log/logging");
+
 var _dec, _dec2, _dec3, _class;
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-let DirBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger, typeof _BackupStorageProvider.BackupStorageProvider === "undefined" ? Object : _BackupStorageProvider.BackupStorageProvider]), _dec(_class = _dec2(_class = _dec3(_class = class DirBackupController {
-  constructor(log, storageProvider) {
-    this.log = log;
+let DirBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _BackupStorageProvider.BackupStorageProvider === "undefined" ? Object : _BackupStorageProvider.BackupStorageProvider]), _dec(_class = _dec2(_class = _dec3(_class = class DirBackupController {
+  constructor(storageProvider) {
     this.storageProvider = storageProvider;
 
+    _defineProperty(this, "log", (0, _logging.classObjLog)(this));
+
     _defineProperty(this, "backup", inp => {
       const storage = this.storageProvider.provide();
 

package/lib/bup/pg/PgBackupController.js

@@ -9,8 +9,6 @@ var _Fs = require("../../fs/Fs");
 
 var _inversify = require("inversify");
 
-var _AppLogger = require("../../log/AppLogger");
-
 var _Shell = require("../../tools/shell/Shell");
 
 var _Path = require("../../fs/path/Path");
@@ -19,6 +17,8 @@ var _BackupStorageProvider = require("../../storage/BackupStorageProvider");
 
 var _Zipper = require("../../tools/compression/Zipper");
 
+var _logging = require("../../log/logging");
+
 var _dec, _dec2, _dec3, _class, _class2, _temp;
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -38,18 +38,19 @@ const parseConnectionUrl = url => {
   };
 };
 
-let PgBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _Fs.Fs === "undefined" ? Object : _Fs.Fs, typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger, typeof _BackupStorageProvider.BackupStorageProvider === "undefined" ? Object : _BackupStorageProvider.BackupStorageProvider, typeof _Shell.Shell === "undefined" ? Object : _Shell.Shell, typeof _Zipper.Zipper === "undefined" ? Object : _Zipper.Zipper]), _dec(_class = _dec2(_class = _dec3(_class = (_temp = _class2 = class PgBackupController {
+let PgBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _Fs.Fs === "undefined" ? Object : _Fs.Fs, typeof _BackupStorageProvider.BackupStorageProvider === "undefined" ? Object : _BackupStorageProvider.BackupStorageProvider, typeof _Shell.Shell === "undefined" ? Object : _Shell.Shell, typeof _Zipper.Zipper === "undefined" ? Object : _Zipper.Zipper]), _dec(_class = _dec2(_class = _dec3(_class = (_temp = _class2 = class PgBackupController {
   constructor( // private gpg: Gpg,
   // private ssh: SshKeyManager,
   fs, // private fsSyncer: FsSyncer,
-  log, storageBackendProvider, // @inject(AppConfig_) private cfg: Config,
+  storageBackendProvider, // @inject(AppConfig_) private cfg: Config,
   sh, zip) {
     this.fs = fs;
-    this.log = log;
     this.storageBackendProvider = storageBackendProvider;
     this.sh = sh;
     this.zip = zip;
 
+    _defineProperty(this, "log", (0, _logging.classObjLog)(this));
+
     _defineProperty(this, "now", () => {
       const d = new Date();
       const fields = [d.getFullYear(), d.getMonth(), d.getDay(), d.getUTCHours(), d.getMinutes(), d.getSeconds()];
@@ -69,7 +70,9 @@ let PgBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.m
 
       this.log.info(`Backing up Postgres database, version=${version}`);
       const connParams = parseConnectionUrl(pgUrl);
-      const pass = connParams.password;
+      const pass = connParams.password; // if (3 > 2)
+      // return
+
       await this.fs.inTmpDir('pg-backup', async dir => {
         const outputDir = _Path.AbsPath.from(dir);
 
@@ -111,7 +114,8 @@ let PgBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.m
         const zipFile = this.fs.listFiles(dir)[0];
         this.zip.unzipDir(zipFile, dir);
         this.fs.rmFile(zipFile);
-        const outFile = this.fs.listFiles(dir)[0]; // Don't forget that this itself might be run in docker
+        const outFile = this.fs.listFiles(dir)[0];
+        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/config/Config.js

@@ -15,8 +15,6 @@ var _expandAndCreatePath = require("./expandAndCreatePath");
 
 var _Fs = require("../fs/Fs");
 
-var _AppLogger = require("../log/AppLogger");
-
 const expandPaths = (cfg, exp) => {
   cfg.aggregates.forEach(a => {
     a.sources.file.forEach(f => {
@@ -34,8 +32,7 @@ const expandPaths = (cfg, exp) => {
 
 
 const readFromFile = cwd => {
-  // TODO get from the context, maybe move FS to CLI framework later?
-  const fs = new _Fs.Fs(cwd, new _AppLogger.AppLogger());
+  const fs = new _Fs.Fs(cwd);
   const cfgPath = cwd.resolve('bup.yaml');
   const cfg = fs.exists(cfgPath) ? (0, _readYaml.readYaml)(cfgPath.str()) : {
     aggregates: [],

package/lib/ctx/Context.js

@@ -21,8 +21,6 @@ var _ContextSymbols = require("./ContextSymbols");
 
 var _AggregateBackupController = require("../bup/aggregate/AggregateBackupController");
 
-var _AppLogger = require("../log/AppLogger");
-
 var _BackupStorageProvider = require("../storage/BackupStorageProvider");
 
 var _ResticFactory = require("../storage/restic/ResticFactory");
@@ -45,10 +43,7 @@ const createContext = (cfg, inp) => {
   const c = new _inversify.Container();
   c.bind(_ContextSymbols.AppConfig_).toConstantValue(cfg);
   c.bind(_ContextSymbols.Inputs_).toConstantValue(inp);
-  const log = new _AppLogger.AppLogger();
-  c.bind(_ContextSymbols.Log_).toConstantValue(log);
-  c.bind(_AppLogger.AppLogger).toConstantValue(log);
-  c.bind(_Fs.Fs).toConstantValue(new _Fs.Fs(cfg.pwd, log));
+  c.bind(_Fs.Fs).toConstantValue(new _Fs.Fs(cfg.pwd));
   const self = [_Gpg.Gpg, _Shell.Shell, _FsSyncer.FsSyncer, _SshKeyManager.SshKeyManager, _BackupStorageProvider.BackupStorageProvider, _StorageConfigProvider.StorageConfigProvider, _ResticFactory.ResticFactory, _AggregateBackupController.AggregateBackupController, _ResticController.ResticController, _B2CredentialsProvider.B2CredentialsProvider, _RCloneFactory.RCloneFactory, _DirBackupController.DirBackupController, _PgBackupController.PgBackupController, _Zipper.Zipper];
   self.forEach(s => c.bind(s).toSelf());
   return c;

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.js

@@ -13,32 +13,33 @@ var _Path = require("./path/Path");
 
 var _inversify = require("inversify");
 
-var _AppLogger = require("../log/AppLogger");
-
 var _expandAndCreatePath = require("../config/expandAndCreatePath");
 
 var _os = _interopRequireDefault(require("os"));
 
+var _logging = require("../log/logging");
+
 var _dec, _dec2, _dec3, _class;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-let Fs = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _Path.AbsPath === "undefined" ? Object : _Path.AbsPath, typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger]), _dec(_class = _dec2(_class = _dec3(_class = class Fs {
-  constructor(cwd, log) {
+let Fs = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _Path.AbsPath === "undefined" ? Object : _Path.AbsPath]), _dec(_class = _dec2(_class = _dec3(_class = class Fs {
+  constructor(cwd) {
     this.cwd = cwd;
-    this.log = log;
+
+    _defineProperty(this, "log", (0, _logging.classObjLog)(this));
 
     _defineProperty(this, "writeFile", (path, content) => {
-      this.log.debug('Writing into file', path);
+      this.log.trace('Writing into file %s', path.str());
       this.ensureParentDir(path);
 
       _fs.default.writeFileSync(path.str(), content);
     });
 
     _defineProperty(this, "writeStream", path => {
-      this.log.debug('Writing into file', path);
+      this.log.trace('Writing into file %s', path.str());
       return _fs.default.createWriteStream(path.str());
     });
 
@@ -51,6 +52,8 @@ let Fs = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:
     _defineProperty(this, "isDir", path => _fs.default.lstatSync(path.str()).isDirectory());
 
     _defineProperty(this, "rmDir", path => {
+      this.log.trace('Removing file %s', path.str());
+
       _fs.default.rmSync(path.str(), {
         recursive: true
       });
@@ -85,7 +88,7 @@ let Fs = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:
     });
 
     _defineProperty(this, "readFile", path => {
-      this.log.debug('Reading from file', path.str());
+      this.log.trace('Reading from file %s', path.str());
       return _fs.default.readFileSync(path.str()).toString();
     });
 
@@ -96,7 +99,7 @@ let Fs = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:
 
     _defineProperty(this, "ensureDir", path => {
       if (!this.exists(path)) {
-        this.log.debug('Dir ', path, 'does not exist. Wil be created');
+        this.log.trace('Dir %s does not exist. Wil be created', path.str());
 
         _fs.default.mkdirSync(path.str(), {
           recursive: true

package/lib/fs/Fs.test.js

@@ -4,17 +4,12 @@ var _Fs = require("./Fs");
 
 var _Path = require("./path/Path");
 
-var _AppLogger = require("../log/AppLogger");
-
 it.skip('withTmpDir', async () => {
-  const fs = new _Fs.Fs(_Path.AbsPath.from(__dirname), new _AppLogger.AppLogger());
+  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/fs/fssync/FsSync.spec.js

@@ -12,8 +12,6 @@ var _Fs = require("../Fs");
 
 var _Path = require("../path/Path");
 
-var _AppLogger = require("../../log/AppLogger");
-
 var _testHelper = require("../../../test/testHelper");
 
 describe('FsSync', () => {
@@ -22,8 +20,7 @@ describe('FsSync', () => {
   const to = _Path.AbsPath.from((0, _test.testDir)('fs/fssync/dst/inner'));
 
   it('syncs dir', () => {
-    const l = new _AppLogger.AppLogger();
-    const sut = new _FsSyncer.FsSyncer(new _Shell.Shell(l), new _Fs.Fs(_Path.AbsPath.from(__dirname), l), l);
+    const sut = new _FsSyncer.FsSyncer(new _Shell.Shell(), new _Fs.Fs(_Path.AbsPath.from(__dirname)));
     sut.syncDirs(from, to);
     expect((0, _areDirsSame.areDirsSame)(from, to)).toBe(true);
   });

package/lib/fs/fssync/FsSyncer.js

@@ -11,7 +11,7 @@ var _Fs = require("../Fs");
 
 var _inversify = require("inversify");
 
-var _AppLogger = require("../../log/AppLogger");
+var _logging = require("../../log/logging");
 
 var _dec, _dec2, _dec3, _class;
 
@@ -23,11 +23,12 @@ const toUnixDirString = path => {
   return val + '/';
 };
 
-let FsSyncer = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _Shell.Shell === "undefined" ? Object : _Shell.Shell, typeof _Fs.Fs === "undefined" ? Object : _Fs.Fs, typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger]), _dec(_class = _dec2(_class = _dec3(_class = class FsSyncer {
-  constructor(sh, fs, log) {
+let FsSyncer = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _Shell.Shell === "undefined" ? Object : _Shell.Shell, typeof _Fs.Fs === "undefined" ? Object : _Fs.Fs]), _dec(_class = _dec2(_class = _dec3(_class = class FsSyncer {
+  constructor(sh, fs) {
     this.sh = sh;
     this.fs = fs;
-    this.log = log;
+
+    _defineProperty(this, "log", (0, _logging.classObjLog)(this));
 
     _defineProperty(this, "sync", (from, to) => {
       if (this.fs.isFile(from)) this.syncFile(from, to);else this.syncDirs(from, to);

package/lib/log/logging.js

@@ -0,0 +1,36 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.makeLog = exports.classObjLog = void 0;
+
+var _pino = _interopRequireDefault(require("pino"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// TODO set from config
+const level = process.env.NODEBUP_LOG_LEVEL || 'trace';
+const root = (0, _pino.default)({
+  name: 'root',
+  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,
+    level
+  });
+}; // TODO make type narrower
+
+
+exports.makeLog = makeLog;
+
+const classObjLog = obj => makeLog(obj.constructor.name);
+
+exports.classObjLog = classObjLog;

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/rclone/RCloneFactory.js

@@ -9,8 +9,6 @@ var _inversify = require("inversify");
 
 var _Shell = require("../../tools/shell/Shell");
 
-var _AppLogger = require("../../log/AppLogger");
-
 var _Fs = require("../../fs/Fs");
 
 var _RcloneClient = require("./RcloneClient");
@@ -19,6 +17,8 @@ var _B2CredentialsProvider = require("../b2/B2CredentialsProvider");
 
 var _RcloneBackupBackend = require("./RcloneBackupBackend");
 
+var _logging = require("../../log/logging");
+
 var _dec, _dec2, _dec3, _class;
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -34,13 +34,14 @@ const parseRepoUrl = url => {
   };
 };
 
-let RCloneFactory = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _Shell.Shell === "undefined" ? Object : _Shell.Shell, typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger, typeof _Fs.Fs === "undefined" ? Object : _Fs.Fs, typeof _B2CredentialsProvider.B2CredentialsProvider === "undefined" ? Object : _B2CredentialsProvider.B2CredentialsProvider]), _dec(_class = _dec2(_class = _dec3(_class = class RCloneFactory {
-  constructor(sh, log, fs, b2) {
+let RCloneFactory = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _Shell.Shell === "undefined" ? Object : _Shell.Shell, typeof _Fs.Fs === "undefined" ? Object : _Fs.Fs, typeof _B2CredentialsProvider.B2CredentialsProvider === "undefined" ? Object : _B2CredentialsProvider.B2CredentialsProvider]), _dec(_class = _dec2(_class = _dec3(_class = class RCloneFactory {
+  constructor(sh, fs, b2) {
     this.sh = sh;
-    this.log = log;
     this.fs = fs;
     this.b2 = b2;
 
+    _defineProperty(this, "log", (0, _logging.classObjLog)(this));
+
     _defineProperty(this, "createBackupBackend", cfg => new _RcloneBackupBackend.RcloneBackupBackend(this.createClient(cfg)));
 
     _defineProperty(this, "createClient", cfg => {
@@ -65,7 +66,7 @@ let RCloneFactory = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metada
         if (creds) throw new Error(`Credentials not supported for local rclone`);
       }
 
-      return new _RcloneClient.RcloneClient(props, this.sh, this.log);
+      return new _RcloneClient.RcloneClient(props, this.sh);
     });
   }
 

package/lib/storage/rclone/RcloneBackupBackend.js

@@ -5,17 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.RcloneBackupBackend = void 0;
 
-var _AppLogger = require("../../log/AppLogger");
-
 var _nclif = require("@ps-aux/nclif");
 
+var _logging = require("../../log/logging");
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 class RcloneBackupBackend {
   constructor(rclone) {
     this.rclone = rclone;
 
-    _defineProperty(this, "log", (0, _AppLogger.logger)(RcloneBackupBackend.name));
+    _defineProperty(this, "log", (0, _logging.classObjLog)(this));
 
     _defineProperty(this, "backup", (from, tags) => {
       if (tags) throw new _nclif.InvalidInputError(`Rclone does not support tags`);

package/lib/storage/rclone/RcloneClient.js

@@ -7,10 +7,10 @@ exports.RcloneClient = void 0;
 
 var _inversify = require("inversify");
 
-var _types = require("../../types");
-
 var _Shell = require("../../tools/shell/Shell");
 
+var _logging = require("../../log/logging");
+
 var _dec, _dec2, _dec3, _class;
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -19,18 +19,19 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * Tested with:  rclone v1.57.0
  * TODO forwarding stdout to the logger
  */
-let RcloneClient = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof RcloneConfig === "undefined" ? Object : RcloneConfig, typeof _Shell.Shell === "undefined" ? Object : _Shell.Shell, typeof _types.Log === "undefined" ? Object : _types.Log]), _dec(_class = _dec2(_class = _dec3(_class = class RcloneClient {
-  constructor(cfg, shell, log) {
+let RcloneClient = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof RcloneConfig === "undefined" ? Object : RcloneConfig, typeof _Shell.Shell === "undefined" ? Object : _Shell.Shell]), _dec(_class = _dec2(_class = _dec3(_class = class RcloneClient {
+  constructor(cfg, shell) {
     this.cfg = cfg;
     this.shell = shell;
-    this.log = log;
 
     _defineProperty(this, "remoteName", 'my');
 
     _defineProperty(this, "cryptRemoteName", 'crypt');
 
+    _defineProperty(this, "log", (0, _logging.classObjLog)(this));
+
     _defineProperty(this, "backup", from => {
-      this.log.debug('Running backup for ', this.cfg.type, this.cfg.location);
+      this.log.debug('Running backup for %s %s', this.cfg.type, this.cfg.location);
       this.shell.exec(`rclone sync ${from.str()} ${this.actualRemoteName}:${this.cfg.location} --config=noconfig`, // Rclone logs error if the file is not set even though it supports env var interface
       {
         env: this.env()
@@ -38,7 +39,7 @@ let RcloneClient = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadat
     });
 
     _defineProperty(this, "restore", to => {
-      this.log.debug('Running restore for ', this.cfg.type, this.cfg.location);
+      this.log.debug('Running restore for %s %s', this.cfg.type, this.cfg.location);
       this.shell.exec(`rclone sync ${this.actualRemoteName}:${this.cfg.location}  ${to.str()} --config=noconfig`, {
         env: this.env()
       });

package/lib/storage/rclone/RcloneClient.spec.js

@@ -15,7 +15,6 @@ var _b2TestConfig = require("../../../test/b2TestConfig");
 var _testHelper = require("../../../test/testHelper");
 
 describe('RcloneClient', () => {
-  const l = _testHelper.testLog;
   const getRestoreDir = (0, _test.testdataDirBuilder)('b2/restore');
   describe('local', () => {
     const backupDir = (0, _test.testDir)('backup/1');
@@ -33,7 +32,7 @@ describe('RcloneClient', () => {
       (0, _testHelper.cleanDir)(restoreDir);
     });
     it('backup & restore', () => {
-      const sut = new _RcloneClient.RcloneClient(cfg, new _Shell.Shell(l), l);
+      const sut = new _RcloneClient.RcloneClient(cfg, new _Shell.Shell());
       sut.backup(_Path.AbsPath.from(backupDir));
       sut.restore(_Path.AbsPath.from(restoreDir));
       const res = (0, _dirCompare.compareSync)(backupDir, restoreDir);
@@ -42,7 +41,7 @@ describe('RcloneClient', () => {
     it('backup & restore unencrypted', () => {
       const sut = new _RcloneClient.RcloneClient({ ...cfg,
         encryption: undefined
-      }, new _Shell.Shell(l), l);
+      }, new _Shell.Shell());
       sut.backup(_Path.AbsPath.from(backupDir));
       sut.restore(_Path.AbsPath.from(restoreDir));
       const res = (0, _dirCompare.compareSync)(backupDir, restoreDir);
@@ -68,7 +67,7 @@ describe('RcloneClient', () => {
       encryption: {
         password: 'foo123'
       }
-    }, new _Shell.Shell(l), l);
+    }, new _Shell.Shell());
     const restoreDir = getRestoreDir('b2');
     afterAll(() => {
       (0, _testHelper.cleanDir)(restoreDir);

package/lib/storage/restic/ResticBackupBackend.js

@@ -7,7 +7,7 @@ exports.ResticBackupBackend = void 0;
 
 var _Path = require("../../fs/path/Path");
 
-var _AppLogger = require("../../log/AppLogger");
+var _logging = require("../../log/logging");
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -15,7 +15,7 @@ class ResticBackupBackend {
   constructor(restic) {
     this.restic = restic;
 
-    _defineProperty(this, "log", (0, _AppLogger.logger)(ResticBackupBackend.name));
+    _defineProperty(this, "log", (0, _logging.classObjLog)(this));
 
     _defineProperty(this, "backup", (from, tags = []) => {
       this.log.info(`Performing backup from=${from}, tags=${tags}`);

package/lib/storage/restic/ResticClient.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ResticClient = void 0;
 
+var _logging = require("../../log/logging");
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 const normalizeUrl = url => {
@@ -20,15 +22,16 @@ const normalizeUrl = url => {
  * TODO forwarding stdout to the logger
  */
 class ResticClient {
-  constructor(cfg, shell, log) {
+  constructor(cfg, shell) {
     this.cfg = cfg;
     this.shell = shell;
-    this.log = log;
 
     _defineProperty(this, "url", void 0);
 
+    _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()
       });
@@ -41,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}`;
@@ -53,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,
@@ -74,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/lib/storage/restic/ResticClient.spec.js

@@ -15,7 +15,6 @@ var _testHelper = require("../../../test/testHelper");
 var _b2TestConfig = require("../../../test/b2TestConfig");
 
 describe('ResticClient', () => {
-  const l = _testHelper.testLog;
   const password = 'foo123';
   describe('local', () => {
     const backupDir = (0, _test.testDir)('backup/1');
@@ -26,7 +25,7 @@ describe('ResticClient', () => {
         password,
         url: `local:${repoDir}`
       }
-    }, new _Shell.Shell(l), l);
+    }, new _Shell.Shell());
     afterAll(() => {
       (0, _testHelper.cleanDir)(repoDir);
       (0, _testHelper.cleanDir)(restoreDir);
@@ -73,7 +72,7 @@ describe('ResticClient', () => {
         url: repoUrl
       },
       backblaze: b2Cfg
-    }, new _Shell.Shell(l), l);
+    }, new _Shell.Shell());
     afterAll(() => {
       (0, _testHelper.cleanDir)(restoreDir);
     });

package/lib/storage/restic/ResticController.js

@@ -13,12 +13,12 @@ var _config = require("../../config");
 
 var _ResticFactory = require("./ResticFactory");
 
-var _AppLogger = require("../../log/AppLogger");
-
 var _StorageConfigProvider = require("../StorageConfigProvider");
 
 var _types = require("../types");
 
+var _logging = require("../../log/logging");
+
 var _dec, _dec2, _dec3, _dec4, _class;
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -31,7 +31,7 @@ let ResticController = (_dec = (0, _inversify.injectable)(), _dec2 = function (t
     this.cfg = cfg;
     this.storageConfigProvider = storageConfigProvider;
 
-    _defineProperty(this, "log", (0, _AppLogger.logger)(ResticController.name));
+    _defineProperty(this, "log", (0, _logging.classObjLog)(this));
 
     _defineProperty(this, "client", () => {
       const props = this.storageConfigProvider.provide();

package/lib/storage/restic/ResticFactory.js

@@ -11,8 +11,6 @@ var _ResticClient = require("./ResticClient");
 
 var _Shell = require("../../tools/shell/Shell");
 
-var _AppLogger = require("../../log/AppLogger");
-
 var _Fs = require("../../fs/Fs");
 
 var _B2CredentialsProvider = require("../b2/B2CredentialsProvider");
@@ -23,10 +21,9 @@ var _dec, _dec2, _dec3, _class;
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-let ResticFactory = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _Shell.Shell === "undefined" ? Object : _Shell.Shell, typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger, typeof _Fs.Fs === "undefined" ? Object : _Fs.Fs, typeof _B2CredentialsProvider.B2CredentialsProvider === "undefined" ? Object : _B2CredentialsProvider.B2CredentialsProvider]), _dec(_class = _dec2(_class = _dec3(_class = class ResticFactory {
-  constructor(sh, log, fs, b2) {
+let ResticFactory = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _Shell.Shell === "undefined" ? Object : _Shell.Shell, typeof _Fs.Fs === "undefined" ? Object : _Fs.Fs, typeof _B2CredentialsProvider.B2CredentialsProvider === "undefined" ? Object : _B2CredentialsProvider.B2CredentialsProvider]), _dec(_class = _dec2(_class = _dec3(_class = class ResticFactory {
+  constructor(sh, fs, b2) {
     this.sh = sh;
-    this.log = log;
     this.fs = fs;
     this.b2 = b2;
 
@@ -49,7 +46,7 @@ let ResticFactory = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metada
         if (creds) throw new Error('Credentials can be set only for the B2 restic backend');
       }
 
-      return new _ResticClient.ResticClient(props, this.sh, this.log);
+      return new _ResticClient.ResticClient(props, this.sh);
     });
   }
 

package/lib/tools/compression/Zipper.js

@@ -9,31 +9,31 @@ var _admZip = _interopRequireDefault(require("adm-zip"));
 
 var _inversify = require("inversify");
 
-var _AppLogger = require("../../log/AppLogger");
+var _logging = require("../../log/logging");
 
-var _dec, _dec2, _dec3, _class;
+var _dec, _class;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-let Zipper = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger]), _dec(_class = _dec2(_class = _dec3(_class = class Zipper {
-  constructor(log) {
-    this.log = log;
+let Zipper = (_dec = (0, _inversify.injectable)(), _dec(_class = class Zipper {
+  constructor() {
+    _defineProperty(this, "log", (0, _logging.classObjLog)(this));
 
     _defineProperty(this, "zipDir", (dir, to) => {
-      this.log.debug(`Zipping ${dir} to ${to}`);
+      this.log.debug(`Zipping %s to %s`, dir.str(), to.str());
       const z = new _admZip.default();
       z.addLocalFolder(dir.str());
       z.writeZip(to.str());
     });
 
     _defineProperty(this, "unzipDir", (zipFile, toDir) => {
-      this.log.debug(`Unzipping ${zipFile} to ${toDir}`);
+      this.log.debug(`Unzipping %s to %s`, zipFile.str(), toDir.str());
       const z = new _admZip.default(zipFile.str());
       z.extractAllTo(toDir.str());
     });
   }
 
-}) || _class) || _class) || _class);
+}) || _class);
 exports.Zipper = Zipper;

package/lib/tools/compression/Zipper.test.js

@@ -6,10 +6,8 @@ var _Path = require("../../fs/path/Path");
 
 var _testHelper = require("../../../test/testHelper");
 
-var _AppLogger = require("../../log/AppLogger");
-
 it('zip', () => {
-  const z = new _Zipper.Zipper(new _AppLogger.AppLogger());
+  const z = new _Zipper.Zipper();
 
   const out = _Path.AbsPath.from(__dirname).resolve('../../test-data/out.zip');
 

package/lib/tools/gpg/Gpg.spec.js

@@ -8,12 +8,10 @@ var _test = require("../../../test");
 
 var _fs = _interopRequireDefault(require("fs"));
 
-var _testHelper = require("../../../test/testHelper");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 it('works', () => {
-  const sut = new _Gpg.Gpg(new _Shell.Shell(_testHelper.testLog));
+  const sut = new _Gpg.Gpg(new _Shell.Shell());
 
   const key = _fs.default.readFileSync((0, _test.testDir)('gpg/john.doe@foo.com.key.asc')).toString();
 

package/lib/tools/shell/Shell.js

@@ -9,22 +9,22 @@ var _shellCmd = require("./shellCmd");
 
 var _inversify = require("inversify");
 
-var _AppLogger = require("../../log/AppLogger");
-
 var _child_process = require("child_process");
 
-var _dec, _dec2, _dec3, _class;
+var _logging = require("../../log/logging");
+
+var _dec, _class;
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 // TODO copy pasted from my other project
 // TODO don't log the full command as it contains secrets
-let Shell = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger]), _dec(_class = _dec2(_class = _dec3(_class = class Shell {
-  constructor(log = (0, _AppLogger.logger)('shell')) {
-    this.log = log;
+let Shell = (_dec = (0, _inversify.injectable)(), _dec(_class = class Shell {
+  constructor() {
+    _defineProperty(this, "log", (0, _logging.classObjLog)(this));
 
     _defineProperty(this, "exec", (cmd, opts = {}) => {
-      this.log.debug(cmd);
+      this.log.trace(cmd);
       (0, _shellCmd.shellCmd)(cmd, { ...opts
       });
     });
@@ -34,7 +34,7 @@ let Shell = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("desi
       stdin,
       opts = {}
     }) => {
-      this.log.debug(`<stdin> > ${cmd}`);
+      this.log.trace(`<stdin> > ${cmd}`);
       (0, _shellCmd.shellCmd)(cmd, { ...opts,
         stdin
       });
@@ -69,5 +69,5 @@ let Shell = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("desi
     });
   }
 
-}) || _class) || _class) || _class);
+}) || _class);
 exports.Shell = Shell;

package/lib/tools/ssh/SshKeyManager.spec.js

@@ -4,13 +4,11 @@ var _SshKeyManager = require("./SshKeyManager");
 
 var _Fs = require("../../fs/Fs");
 
-var _AppLogger = require("../../log/AppLogger");
-
 var _Path = require("../../fs/path/Path");
 
 // TODO setup ci to make tests work
 it.skip('works', () => {
-  const sut = new _SshKeyManager.SshKeyManager(new _Fs.Fs(_Path.AbsPath.from(__dirname), new _AppLogger.AppLogger()));
+  const sut = new _SshKeyManager.SshKeyManager(new _Fs.Fs(_Path.AbsPath.from(__dirname)));
   const key = sut.exportKey('id_rsa');
   console.log('key', key);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ps-aux/nodebup",
-  "version": "0.9.3",
+  "version": "0.9.5",
   "description": "",
   "module": "lib/index.js",
   "main": "lib/index.js",
@@ -86,7 +86,8 @@
     "ini": "^2.0.0",
     "inversify": "^6.0.1",
     "js-yaml": "^4.1.0",
-    "pino": "^7.6.2",
+    "pino": "^7.11.0",
+    "pino-pretty": "^9.1.1",
     "ramda": "^0.27.1",
     "reflect-metadata": "^0.1.13",
     "wait-on": "^6.0.0",

package/lib/log/AppLogger.js

@@ -1,35 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.logger = exports.AppLogger = void 0;
-
-var _ConsoleLogger = require("./ConsoleLogger");
-
-var _inversify = require("inversify");
-
-var _dec, _dec2, _dec3, _class;
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-let AppLogger = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [void 0]), _dec(_class = _dec2(_class = _dec3(_class = class AppLogger {
-  constructor(mute = false) {
-    _defineProperty(this, "log", new _ConsoleLogger.ConsoleLogger());
-
-    _defineProperty(this, "debug", this.log.debug);
-
-    _defineProperty(this, "info", this.log.info);
-
-    _defineProperty(this, "error", this.log.error);
-
-    if (mute) this.log.setEnabled(false);
-  }
-
-}) || _class) || _class) || _class); // TODO make use of the name for logging
-
-exports.AppLogger = AppLogger;
-
-const logger = name => new AppLogger();
-
-exports.logger = logger;

package/lib/log/ConsoleLogger.js

@@ -1,33 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.ConsoleLogger = void 0;
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-class ConsoleLogger {
-  constructor() {
-    _defineProperty(this, "enabled", true);
-
-    _defineProperty(this, "print", (...args) => console.log(...args.map(a => a.toString())));
-
-    _defineProperty(this, "debug", (...args) => {
-      if (this.enabled) this.print(args);
-    });
-
-    _defineProperty(this, "info", (...args) => {
-      if (this.enabled) this.print(args);
-    });
-
-    _defineProperty(this, "error", this.print);
-
-    _defineProperty(this, "setEnabled", enabled => {
-      this.enabled = enabled;
-    });
-  }
-
-}
-
-exports.ConsoleLogger = ConsoleLogger;

package/lib/log/MinimalLogger.js

@@ -1,31 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.minimalLogger = void 0;
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-class MinimalLogger {
-  constructor(onlyError = true) {
-    this.onlyError = onlyError;
-
-    _defineProperty(this, "debug", (...args) => {
-      if (this.onlyError) return;
-      console.log(...args);
-    });
-
-    _defineProperty(this, "info", (...args) => {
-      if (this.onlyError) return;
-      console.log(...args);
-    });
-
-    _defineProperty(this, "error", console.error);
-  }
-
-}
-
-const minimalLogger = (onlyError = true) => new MinimalLogger(onlyError);
-
-exports.minimalLogger = minimalLogger;

package/lib/types.js

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