added admin.etcdGetWork() and admin.etcdDeleteWork() commands

METADIUM · Sep 23, 2019 · 0c14910 · 0c14910
1 parent fab71b0
commit 0c14910
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 0 deletions.
diff --git a/eth/api.go b/eth/api.go
@@ -299,6 +299,16 @@ func (api *PrivateAdminAPI) EtcdMoveLeader(name string) error {
 	return metaapi.EtcdMoveLeader(name)
 }
 
+// Get the latest logged work
+func (api *PrivateAdminAPI) EtcdGetWork() (string, error) {
+	return metaapi.EtcdGetWork()
+}
+
+// Remove the latest logged work
+func (api *PrivateAdminAPI) EtcdDeleteWork() error {
+	return metaapi.EtcdDeleteWork()
+}
+
 // Synchronize with the peer
 func (api *PrivateAdminAPI) SynchroniseWith(id enode.ID) error {
 	return api.eth.protocolManager.SynchroniseWith(id)

diff --git a/internal/web3ext/web3ext.go b/internal/web3ext/web3ext.go
@@ -249,6 +249,16 @@ web3._extend({
 			params: 1,
 			inputFormatter: [null]
 		}),
+		new web3._extend.Method({
+			name: 'etcdGetWork',
+			call: 'admin_etcdGetWork',
+			params: 0
+		}),
+		new web3._extend.Method({
+			name: 'etcdDeleteWork',
+			call: 'admin_etcdDeleteWork',
+			params: 0
+		}),
 	],
 	properties: [
 		new web3._extend.Property({

diff --git a/metadium/admin.go b/metadium/admin.go
@@ -1441,6 +1441,8 @@ func init() {
 	metaapi.EtcdRemoveMember = EtcdRemoveMember
 	metaapi.EtcdJoin = EtcdJoin
 	metaapi.EtcdMoveLeader = EtcdMoveLeader
+	metaapi.EtcdGetWork = EtcdGetWork
+	metaapi.EtcdDeleteWork = EtcdDeleteWork
 }
 
 /* EOF */
diff --git a/metadium/api/api.go b/metadium/api/api.go
@@ -39,6 +39,8 @@ var (
 	EtcdRemoveMember func(name string) (string, error)
 	EtcdJoin         func(cluster string) error
 	EtcdMoveLeader   func(name string) error
+	EtcdGetWork      func() (string, error)
+	EtcdDeleteWork   func() error
 )
 
 func SetMsgChannel(ch chan interface{}) {

diff --git a/metadium/etcdutil.go b/metadium/etcdutil.go
@@ -639,4 +639,18 @@ func EtcdJoin(name string) error {
 	return admin.etcdJoin(name)
 }
 
+func EtcdGetWork() (string, error) {
+	if admin == nil {
+		return "", ErrNotRunning
+	}
+	return admin.etcdGet("metadium-work")
+}
+
+func EtcdDeleteWork() error {
+	if admin == nil {
+		return ErrNotRunning
+	}
+	return admin.etcdDelete("metadium-work")
+}
+
 /* EOF */