Merge pull request #19 from orbitdb/feat/orbit-db-master

haadcode · web-flow · commit 17b67f22fce6 · 2018-07-18T15:03:24.000+03:00
Fix replicationStatus and use OrbitDB from master
diff --git a/src/commands/info.js b/src/commands/info.js
@@ -32,7 +32,7 @@ exports.handler = (argv) => {
       process.stdout.write(`> Owner: ${db.id}\n`)
       process.stdout.write(`> Data file: ./${db._cache.path}\n`)
       process.stdout.write(`> Entries: ${db.type === 'counter' ? 1 : db._oplog.length}\n`)
-      process.stdout.write(`> Oplog length: ${db._oplog.length} / ${db._replicationInfo.max}\n`)
+      process.stdout.write(`> Oplog length: ${db._oplog.length} / ${db.replicationStatus.max}\n`)
       process.stdout.write(`> Write-access: \n> ${db.access.write.join('\n> ')}\n`)
     })
     .catch(exitOnError)
diff --git a/src/lib/replication-loop.js b/src/lib/replication-loop.js
@@ -22,7 +22,7 @@ const replicate = (db, argv = {}) => {
   return new Promise((resolve, reject) => {
     if (argv.progress || jsonOutput) {
       const outputJson = (id, json = false) => {
-        process.stdout.write(JSON.stringify({ id : id, progress: db._replicationInfo.progress, max: db._replicationInfo.max }))
+        process.stdout.write(JSON.stringify({ id : id, progress: db.replicationStatus.progress, max: db.replicationStatus.max }))
         process.stdout.write('\n')
       }
 
@@ -32,12 +32,12 @@ const replicate = (db, argv = {}) => {
           return
         }
 
-        outputProgress('Replicating', id, db._replicationInfo.progress, db._replicationInfo.max, startTime)
+        outputProgress('Replicating', id, db.replicationStatus.progress, db.replicationStatus.max, startTime)
       }
 
       db.events.on('replicate', (id) => {
-        if (db._replicationInfo.max > latestProgress) {
-          latestProgress = db._replicationInfo.max
+        if (db.replicationStatus.max > latestProgress) {
+          latestProgress = db.replicationStatus.max
           output(id)
         }
       })
@@ -52,7 +52,7 @@ const replicate = (db, argv = {}) => {
     })
 
     if (argv.progress) {
-      outputProgress('Replicating', db.address.toString(), db._replicationInfo.progress, db._replicationInfo.max, new Date().getTime())
+      outputProgress('Replicating', db.address.toString(), db.replicationStatus.progress, db.replicationStatus.max, new Date().getTime())
     } else if (jsonOutput) {
       // Output nothing
     } else {
