update expire policy

main.go

@@ -26,15 +26,15 @@ func main() {
 		panic(err)
 	}
 
-	routerServer, err := server.NewRpcServer(cfg)
+	preServer, err := server.NewRpcServer(cfg)
 	if err != nil {
 		panic(err)
 	}
-	routerServer.Listen()
+	preServer.Listen()
 
 	defer func() {
 		log.Info("begin close pre server")
-		routerServer.Close()
+		preServer.Close()
 	} ()
 
 	c := make(chan os.Signal, 1)

server/rpchandler.go

@@ -84,10 +84,13 @@ func (service *NodeService) CollectFragment(fragments *common.ReqSendKeyFragment
 		PubProofU:            fragments.PubProofU,
 		Ramdom:               fragments.Random,
 		Value:                fragments.Value,
-		Expire:               time.Now().Unix() + fragments.Expire * 3600,
 		PrecurPub:            fragments.PrecurPub,
+	}
 
+	if fragments.Expire > 0 {
+		dbVlaue.Expire = time.Now().Unix() + fragments.Expire
 	}
+
 	err := service.db.Put(dbKey, types.Encode(dbVlaue), nil)
 	if err != nil {
 		rlog.Error("CollectFragment. Put data to db failed", "error", err)

server/server.go

@@ -29,7 +29,7 @@ import (
 	"time"
 )
 
-var rlog = log.New("module", "router server")
+var rlog = log.New("module", "proxy reencrypt server")
 
 type RpcServer struct {
 	service    *NodeService
@@ -150,7 +150,7 @@ func (rr *RpcServer) listen() (int, error) {
 	co := cors.New(cors.Options{})
 
 	var handler http.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		rlog.Debug("RouterRPCServer", "RemoteAddr", r.RemoteAddr)
+		rlog.Debug("PRE RPCServer", "RemoteAddr", r.RemoteAddr)
 		ip, _, err := net.SplitHostPort(r.RemoteAddr)
 		if err != nil {
 			writeError(w, r, 0, fmt.Sprintf(`The %s Address is not authorized!`, ip))
@@ -189,7 +189,7 @@ func (rr *RpcServer) Close() {
 	if rr.l != nil {
 		err := rr.l.Close()
 		if err != nil {
-			rlog.Error("RouterRPCServer close", "err", err)
+			rlog.Error("PRE RPCServer close", "err", err)
 		}
 	}
 }
@@ -207,7 +207,7 @@ func CheckExpireRoutine(db *leveldb.DB) {
 				continue
 			}
 
-			if keyFragment.Expire <= now {
+			if keyFragment.Expire != 0 && keyFragment.Expire <= now {
 				rlog.Info("Key Fragment Expired", "key", string(iter.Key()))
 				remove = append(remove, iter.Key())
 			}
@@ -221,6 +221,6 @@ func CheckExpireRoutine(db *leveldb.DB) {
 			}
 		}
 
-		time.Sleep(time.Hour)
+		time.Sleep(time.Minute)
 	}
 }