This commit is contained in:
Qiu Jian
2019-02-16 15:17:31 +08:00
parent 066d155a16
commit 8554d13c4a
6 changed files with 10 additions and 10 deletions
+2 -2
View File
@@ -2,9 +2,9 @@ package appctx
import (
"context"
"time"
"yunion.io/x/pkg/trace"
"time"
)
type AppContextKey string
@@ -24,7 +24,7 @@ const (
APP_CONTEXT_KEY_TASK_NOTIFY_URL = AppContextKey("tasknotifyurl")
APP_CONTEXT_KEY_OBJECT_ID = AppContextKey("objectid")
APP_CONTEXT_KEY_OBJECT_TYPE = AppContextKey("objecttype")
APP_CONTEXT_KEY_START_TIME = AppContextKey("starttime")
APP_CONTEXT_KEY_START_TIME = AppContextKey("starttime")
)
func AppContextServiceName(ctx context.Context) string {
+1 -1
View File
@@ -5,8 +5,8 @@ import (
"net/http"
"yunion.io/x/jsonutils"
"yunion.io/x/onecloud/pkg/mcclient"
"yunion.io/x/onecloud/pkg/cloudcommon"
"yunion.io/x/onecloud/pkg/mcclient"
)
type ITask interface {
+1 -1
View File
@@ -676,4 +676,4 @@ func (task *STask) GetTaskRequestHeader() http.Header {
func (task *STask) GetStartTime() time.Time {
return task.CreatedAt
}
}
+1 -1
View File
@@ -314,4 +314,4 @@ func (model *SVirtualResourceBase) GetShortDesc(ctx context.Context) *jsonutils.
desc.Add(jsonutils.NewString(tc.GetName()), "owner_tenant")
}
return desc
}
}
+1 -1
View File
@@ -26,7 +26,7 @@ func ParsePropStr(lines string) map[string]string {
func BuildPropStr(prop map[string]string) string {
keys := []string{}
for k, _ := range prop {
for k := range prop {
keys = append(keys, k)
}
sort.Strings(keys)
+4 -4
View File
@@ -3,20 +3,20 @@ package logclient
import (
"context"
"strings"
"time"
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/util/stringutils"
"yunion.io/x/pkg/util/timeutils"
"yunion.io/x/onecloud/pkg/appctx"
"yunion.io/x/onecloud/pkg/appsrv"
"yunion.io/x/onecloud/pkg/cloudcommon"
"yunion.io/x/onecloud/pkg/cloudcommon/consts"
"yunion.io/x/onecloud/pkg/mcclient"
"yunion.io/x/onecloud/pkg/mcclient/auth"
"yunion.io/x/onecloud/pkg/mcclient/modules"
"time"
"yunion.io/x/pkg/util/timeutils"
"yunion.io/x/onecloud/pkg/cloudcommon"
"yunion.io/x/onecloud/pkg/appctx"
)
const (