[servicecomb-service-center] branch master updated: [bug] move the time setting of the service to the disco layer (#1285)

[li...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

littlecui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git


The following commit(s) were added to refs/heads/master by this push:
     new 51a3c23  [bug] move the time setting of the service to the disco layer (#1285)
51a3c23 is described below

commit 51a3c23b1e34268022f78333d589f4ea73a883e1
Author: robotljw <79...@qq.com>
AuthorDate: Mon Mar 7 09:17:17 2022 +0800

    [bug] move the time setting of the service to the disco layer (#1285)
---
 datasource/etcd/ms.go            |  2 --
 datasource/mongo/ms.go           |  2 --
 server/service/disco/metadata.go | 10 ++++++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/datasource/etcd/ms.go b/datasource/etcd/ms.go
index 73da1d3..ab3e723 100644
--- a/datasource/etcd/ms.go
+++ b/datasource/etcd/ms.go
@@ -82,8 +82,6 @@ func (ds *MetadataManager) RegisterService(ctx context.Context, request *pb.Crea
 		ctx = util.SetContext(ctx, uuid.ContextKey, index)
 		service.ServiceId = uuid.Generator().GetServiceID(ctx)
 	}
-	service.Timestamp = strconv.FormatInt(time.Now().Unix(), 10)
-	service.ModTimestamp = service.Timestamp
 
 	data, err := json.Marshal(service)
 	if err != nil {
diff --git a/datasource/mongo/ms.go b/datasource/mongo/ms.go
index 8999c71..58f0cd3 100644
--- a/datasource/mongo/ms.go
+++ b/datasource/mongo/ms.go
@@ -74,8 +74,6 @@ func (ds *MetadataManager) RegisterService(ctx context.Context, request *discove
 		ctx = util.SetContext(ctx, uuid.ContextKey, util.StringJoin([]string{domain, project, service.Environment, service.AppId, service.ServiceName, service.Alias, service.Version}, "/"))
 		service.ServiceId = uuid.Generator().GetServiceID(ctx)
 	}
-	service.Timestamp = strconv.FormatInt(time.Now().Unix(), 10)
-	service.ModTimestamp = service.Timestamp
 	// the service unique index in table is (serviceId/serviceEnv,serviceAppid,servicename,serviceVersion)
 	if len(service.Alias) != 0 {
 		serviceID, err := GetServiceID(ctx, &discovery.MicroServiceKey{
diff --git a/server/service/disco/metadata.go b/server/service/disco/metadata.go
index 8c1f430..fc2478b 100644
--- a/server/service/disco/metadata.go
+++ b/server/service/disco/metadata.go
@@ -20,6 +20,8 @@ package disco
 import (
 	"context"
 	"fmt"
+	"strconv"
+	"time"
 
 	"github.com/apache/servicecomb-service-center/datasource"
 	"github.com/apache/servicecomb-service-center/pkg/log"
@@ -69,9 +71,17 @@ func registerService(ctx context.Context, request *pb.CreateServiceRequest) (*pb
 		return nil, quotaErr
 	}
 
+	assignDefaultValue(service)
+
 	return datasource.GetMetadataManager().RegisterService(ctx, request)
 }
 
+func assignDefaultValue(service *pb.MicroService) {
+	formatTenBase := 10
+	service.Timestamp = strconv.FormatInt(time.Now().Unix(), formatTenBase)
+	service.ModTimestamp = service.Timestamp
+}
+
 func registerServiceDetails(ctx context.Context, in *pb.CreateServiceRequest, serviceID string) (*pb.CreateServiceResponse, error) {
 	var chanLen = 0
 	errorsCh := make(chan error, 10)