Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix when time is null print a bad pipe value. #277

Closed
wants to merge 4 commits into from
Closed

Fix when time is null print a bad pipe value. #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
26e53ce
backend:Update all time to a time address
chengyumeng Feb 15, 2019
6d973db
frontend:fix when time is undefine the pip print a bad value
chengyumeng Feb 15, 2019
57f7f9a
Merge branch 'master' into hotifx/time_error
chengyumeng Feb 15, 2019
8aafdfa
Merge branch 'master' into hotifx/time_error
Feb 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/backend/bus/message/message.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ type HookMessageData struct {

User string
IP string
Datetime time.Time
Datetime *time.Time

EventKey string
Payload interface{}
Expand Down
4 changes: 2 additions & 2 deletions src/backend/controllers/openapi/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ func (c *OpenAPIController) GetDeploymentStatus() {
Name: deployInfo.ObjectMeta.Name,
Namespace: deployInfo.ObjectMeta.Namespace,
Labels: deployInfo.ObjectMeta.Labels,
CreateTime: deployInfo.ObjectMeta.CreationTimestamp.Time,
CreateTime: &(deployInfo.ObjectMeta.CreationTimestamp.Time),
PodsState: response.PodInfo{
Current: deployInfo.Pods.Current,
Desired: deployInfo.Pods.Desired,
Expand All @@ -199,7 +199,7 @@ func (c *OpenAPIController) GetDeploymentStatus() {
State: pod.State,
PodIp: pod.PodIp,
NodeName: pod.NodeName,
StartTime: &pod.StartTime,
StartTime: pod.StartTime,
Labels: pod.Labels,
}
for _, status := range pod.ContainerStatus {
Expand Down
8 changes: 4 additions & 4 deletions src/backend/models/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ func (*App) TableName() string {
type AppStar struct {
App

CreateTime time.Time `json:"createTime"`
NamespaceId int64 `json:"namespaceId"`
NamespaceName string `json:"namespaceName"`
Starred bool `json:"starred"`
CreateTime *time.Time `json:"createTime"`
NamespaceId int64 `json:"namespaceId"`
NamespaceName string `json:"namespaceName"`
Starred bool `json:"starred"`
}

type AppStatistics struct {
Expand Down
8 changes: 4 additions & 4 deletions src/backend/models/configmap_template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ type ConfigMapTemplate struct {
MetaData string `orm:"type(text)" json:"metaData,omitempty"`
Description string `orm:"size(512)" json:"description,omitempty"`

CreateTime time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`
CreateTime *time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime *time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`

Status []*PublishStatus `orm:"-" json:"status,omitempty"`
ConfigMapId int64 `orm:"-" json:"configMapId,omitempty"`
Expand Down
8 changes: 4 additions & 4 deletions src/backend/models/cronjob_template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ type CronjobTemplate struct {
MetaData string `orm:"type(text)" json:"metaData,omitempty"`
Description string `orm:"size(512)" json:"description,omitempty"`

CreateTime time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`
CreateTime *time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime *time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`

Status []*PublishStatus `orm:"-" json:"status,omitempty"`
CronjobId int64 `orm:"-" json:"cronjobId,omitempty"`
Expand Down
8 changes: 4 additions & 4 deletions src/backend/models/daemonset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ type DaemonSet struct {
Description string `orm:"null;size(512)" json:"description,omitempty"`
OrderId int64 `orm:"index;default(0)" json:"order"`

CreateTime time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`
CreateTime *time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime *time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`

AppId int64 `orm:"-" json:"appId,omitempty"`
}
Expand Down
8 changes: 4 additions & 4 deletions src/backend/models/daemonset_template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ type DaemonSetTemplate struct {
DaemonSet *DaemonSet `orm:"index;rel(fk)" json:"daemonSet,omitempty"`
Description string `orm:"size(512)" json:"description,omitempty"`

CreateTime time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`
CreateTime *time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime *time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`

DaemonSetId int64 `orm:"-" json:"daemonSetId,omitempty"`
Status []*PublishStatus `orm:"-" json:"status,omitempty"`
Expand Down
8 changes: 4 additions & 4 deletions src/backend/models/deployment_template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ type DeploymentTemplate struct {
// TODO
// 如果使用指针类型auto_now_add和auto_now可以自动生效,但是orm QueryRows无法对指针类型的time正常赋值，
// 不使用指针类型创建时需要手动把创建时间设置为当前时间,更新时也需要处理创建时间
CreateTime time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`
CreateTime *time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime *time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`

DeploymentId int64 `orm:"-" json:"deploymentId,omitempty"`
Status []*PublishStatus `orm:"-" json:"status,omitempty"`
Expand Down
8 changes: 4 additions & 4 deletions src/backend/models/hpa_template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ type HPATemplate struct {
HPA *HPA `orm:"index;rel(fk);column(hpa_id)" json:"hpa,omitempty"`
Description string `orm:"size(512)" json:"description,omitempty"`

CreateTime time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`
CreateTime *time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime *time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`

Status []*PublishStatus `orm:"-" json:"status,omitempty"`
HPAId int64 `orm:"-" json:"hpaId,omitempty"`
Expand Down
8 changes: 4 additions & 4 deletions src/backend/models/ingress_template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ type IngressTemplate struct {
Ingress *Ingress `orm:"index;rel(fk);column(ingress_id)" json:"ingress,omitempty"`
Description string `orm:"size(512)" json:"description,omitempty"`

CreateTime time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`
CreateTime *time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime *time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`

Status []*PublishStatus `orm:"-" json:"status,omitempty"`
IngressId int64 `orm:"-" json:"ingressId,omitempty"`
Expand Down
4 changes: 2 additions & 2 deletions src/backend/models/publish_history.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ func (*PublishHistory) TableName() string {
}

type DeployCount struct {
Date time.Time `json:"date,omitempty"`
Count int `json:"count"`
Date *time.Time `json:"date,omitempty"`
Count int `json:"count"`
}

func (*publishHistoryModel) Add(m *PublishHistory) (id int64, err error) {
Expand Down
8 changes: 4 additions & 4 deletions src/backend/models/pvc_template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ type PersistentVolumeClaimTemplate struct {
MetaData string `orm:"type(text)" json:"metaData,omitempty"`
Description string `orm:"size(512)" json:"description,omitempty"`

CreateTime time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`
CreateTime *time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime *time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`

Status []*PublishStatus `orm:"-" json:"status,omitempty"`
PersistentVolumeClaimId int64 `orm:"-" json:"persistentVolumeClaimId,omitempty"`
Expand Down
2 changes: 1 addition & 1 deletion src/backend/models/response/response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ type Deployment struct {
Name string `json:"name,omitempty"`
Namespace string `json:"namespace,omitempty"`
Labels map[string]string `json:"labels,omitempty"`
CreateTime time.Time `json:"createTime,omitempty"`
CreateTime *time.Time `json:"createTime,omitempty"`
PodsState PodInfo `json:"podState,omitempty"`
}

Expand Down
8 changes: 4 additions & 4 deletions src/backend/models/secret_template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ type SecretTemplate struct {
MetaData string `orm:"type(text)" json:"metaData,omitempty"`
Description string `orm:"size(512)" json:"description,omitempty"`

CreateTime time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`
CreateTime *time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime *time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`

Status []*PublishStatus `orm:"-" json:"status,omitempty"`
SecretId int64 `orm:"-" json:"secretId,omitempty"`
Expand Down
8 changes: 4 additions & 4 deletions src/backend/models/service_template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ type ServiceTemplate struct {
Service *Service `orm:"index;rel(fk);column(service_id)" json:"service,omitempty"`
Description string `orm:"size(512)" json:"description,omitempty"`

CreateTime time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`
CreateTime *time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime *time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`

Status []*PublishStatus `orm:"-" json:"status,omitempty"`
ServiceId int64 `orm:"-" json:"serviceId,omitempty"`
Expand Down
8 changes: 4 additions & 4 deletions src/backend/models/statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ type Statefulset struct {
Description string `orm:"null;size(512)" json:"description,omitempty"`
OrderId int64 `orm:"index;default(0)" json:"order"`

CreateTime time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`
CreateTime *time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime *time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`

AppId int64 `orm:"-" json:"appId,omitempty"`
}
Expand Down
8 changes: 4 additions & 4 deletions src/backend/models/statefulset_template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ type StatefulsetTemplate struct {
Statefulset *Statefulset `orm:"index;rel(fk);column(statefulset_id)" json:"statefulset,omitempty"`
Description string `orm:"size(512)" json:"description,omitempty"`

CreateTime time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`
CreateTime *time.Time `orm:"auto_now_add;type(datetime)" json:"createTime,omitempty"`
UpdateTime *time.Time `orm:"auto_now;type(datetime)" json:"updateTime,omitempty"`
User string `orm:"size(128)" json:"user,omitempty"`
Deleted bool `orm:"default(false)" json:"deleted,omitempty"`

StatefulsetId int64 `orm:"-" json:"statefulsetId,omitempty"`
Status []*PublishStatus `orm:"-" json:"status,omitempty"`
Expand Down
3 changes: 3 additions & 0 deletions src/backend/resources/dataselector/dataselector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ func ParseToComparableValue(value interface{}) ComparableValue {
return StdComparableInt(value.(int))
case time.Time:
return StdComparableTime(value.(time.Time))
case *time.Time:
v := value.(*time.Time)
return StdComparableTime(*v)
default:
return nil
}
Expand Down
5 changes: 3 additions & 2 deletions src/backend/resources/pod/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ type Pod struct {
State string `json:"state,omitempty"`
PodIp string `json:"podIp,omitempty"`
NodeName string `json:"nodeName,omitempty"`
StartTime time.Time `json:"startTime,omitempty"`
StartTime *time.Time `json:"startTime,omitempty"`
Labels map[string]string `json:"labels,omitempty"`
}

Expand Down Expand Up @@ -178,7 +178,8 @@ func toPod(kpod *v1.Pod) *Pod {
}

if kpod.Status.StartTime != nil {
pod.StartTime = kpod.Status.StartTime.Local()
t := kpod.Status.StartTime.Local()
pod.StartTime = &t
}

status := make([]ContainerStatus, 0)
Expand Down
14 changes: 9 additions & 5 deletions src/backend/workers/webhook/payload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type Request struct {
App response.App `json:"app"`
User string `json:"user"`
IP string `json:"ip"`
Datetime time.Time `json:"datetime"`
Datetime *time.Time `json:"datetime"`
Payload interface{} `json:"payload"`
}

Expand Down Expand Up @@ -62,12 +62,13 @@ func PublishEventDeployment(namespaceId int64, appId int64, user string, ip stri
if !enable() {
return
}
t := time.Now()
messageData, err := json.Marshal(message.HookMessageData{
NamespaceId: namespaceId,
AppId: appId,
User: user,
IP: ip,
Datetime: time.Now(),
Datetime: &t,
EventKey: hookevent.EventDeployment.Key,
Payload: EventDeploymentPayload{
Action: action,
Expand All @@ -91,12 +92,13 @@ func PublishEventService(namespaceId int64, appId int64, user string, ip string,
if !enable() {
return
}
t := time.Now()
messageData, err := json.Marshal(message.HookMessageData{
NamespaceId: namespaceId,
AppId: appId,
User: user,
IP: ip,
Datetime: time.Now(),
Datetime: &t,
EventKey: hookevent.EventService.Key,
Payload: EventServicePayload{
Action: action,
Expand All @@ -120,12 +122,13 @@ func PublishEventIngress(namespaceId int64, appId int64, user string, ip string,
if !enable() {
return
}
t := time.Now()
messageData, err := json.Marshal(message.HookMessageData{
NamespaceId: namespaceId,
AppId: appId,
User: user,
IP: ip,
Datetime: time.Now(),
Datetime: &t,
EventKey: hookevent.EventIngress.Key,
Payload: EventIngressPayload{
Action: action,
Expand All @@ -151,12 +154,13 @@ func PublishEventMember(namespaceId int64, appId int64, user string, ip string,
}
m := response.User{}
m.LoadFromModel(member)
t := time.Now()
messageData, err := json.Marshal(message.HookMessageData{
NamespaceId: namespaceId,
AppId: appId,
User: user,
IP: ip,
Datetime: time.Now(),
Datetime: &t,
EventKey: hookevent.EventMember.Key,
Payload: EventMemberPayload{
Action: action,
Expand Down
4 changes: 4 additions & 0 deletions src/frontend/src/app/shared/pipe/relative-time.filter.pipe.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ export class RelativeTimeFilterPipe implements PipeTransform {

const elapsed = current - input;

if (inputDate === null || inputDate === undefined) {
return '';
}

if (elapsed < msPerMinute) {
return Math.floor(elapsed / 1000) + 's';
} else if (elapsed < msPerHour) {
Expand Down