From 8a0b32530217887acd4e9c9246798ea8c722a8f5 Mon Sep 17 00:00:00 2001 From: Zhang Dongliang Date: Tue, 26 Mar 2019 17:53:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A2=B3=E7=90=86=20logclient=20=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=BB=91=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/networks.go | 2 +- pkg/compute/tasks/guest_delete_task.go | 4 ++-- pkg/compute/tasks/guest_disk_snapshot_task.go | 2 +- pkg/compute/tasks/loadbalancer_acl_delete_task.go | 4 ++-- .../tasks/loadbalancer_backendgroup_delete_task.go | 4 ++-- .../tasks/loadbalancer_certificate_delete_task.go | 4 ++-- pkg/compute/tasks/loadbalancer_delete_task.go | 4 ++-- .../tasks/loadbalancer_listener_delete_task.go | 4 ++-- .../tasks/loadbalancer_listener_rule_delete_task.go | 4 ++-- pkg/util/logclient/logclient.go | 13 +++++++++++++ 10 files changed, 29 insertions(+), 16 deletions(-) diff --git a/pkg/compute/models/networks.go b/pkg/compute/models/networks.go index 208edbdf9b..3fcd194d7e 100644 --- a/pkg/compute/models/networks.go +++ b/pkg/compute/models/networks.go @@ -1691,7 +1691,7 @@ func (self *SNetwork) PerformMerge(ctx context.Context, userCred mcclient.TokenC } note = map[string]string{"network": self.Id} db.OpsLog.LogEvent(self, db.ACT_DELETE, note, userCred) - logclient.AddActionLogWithContext(ctx, self, logclient.ACT_DELETE, note, userCred, true) + logclient.AddActionLogWithContext(ctx, self, logclient.ACT_DELOCATE, note, userCred, true) return nil, nil } diff --git a/pkg/compute/tasks/guest_delete_task.go b/pkg/compute/tasks/guest_delete_task.go index afee797de0..dd37a307fa 100644 --- a/pkg/compute/tasks/guest_delete_task.go +++ b/pkg/compute/tasks/guest_delete_task.go @@ -234,7 +234,7 @@ func (self *GuestDeleteTask) DoDeleteGuest(ctx context.Context, guest *models.SG func (self *GuestDeleteTask) OnFailed(ctx context.Context, guest *models.SGuest, err jsonutils.JSONObject) { guest.SetStatus(self.UserCred, models.VM_DELETE_FAIL, err.String()) db.OpsLog.LogEvent(guest, db.ACT_DELOCATE_FAIL, err, self.UserCred) - logclient.AddActionLogWithStartable(self, guest, logclient.ACT_DELETE, err, self.UserCred, false) + logclient.AddActionLogWithStartable(self, guest, logclient.ACT_DELOCATE, err, self.UserCred, false) self.SetStageFailed(ctx, err.String()) } @@ -258,7 +258,7 @@ func (self *GuestDeleteTask) DeleteGuest(ctx context.Context, guest *models.SGue guest.RealDelete(ctx, self.UserCred) guest.RemoveAllMetadata(ctx, self.UserCred) db.OpsLog.LogEvent(guest, db.ACT_DELOCATE, nil, self.UserCred) - logclient.AddActionLogWithStartable(self, guest, logclient.ACT_DELETE, nil, self.UserCred, true) + logclient.AddActionLogWithStartable(self, guest, logclient.ACT_DELOCATE, nil, self.UserCred, true) if !guest.IsSystem && !isPendingDeleted { self.NotifyServerDeleted(ctx, guest) } diff --git a/pkg/compute/tasks/guest_disk_snapshot_task.go b/pkg/compute/tasks/guest_disk_snapshot_task.go index e6a2d13924..61723c633e 100644 --- a/pkg/compute/tasks/guest_disk_snapshot_task.go +++ b/pkg/compute/tasks/guest_disk_snapshot_task.go @@ -294,7 +294,7 @@ func (self *SnapshotDeleteTask) OnReloadDiskSnapshot(ctx context.Context, snapsh func (self *SnapshotDeleteTask) TaskComplete(ctx context.Context, snapshot *models.SSnapshot, data jsonutils.JSONObject) { db.OpsLog.LogEvent(snapshot, db.ACT_SNAPSHOT_DELETE, snapshot.GetShortDesc(ctx), self.UserCred) - logclient.AddActionLogWithStartable(self, snapshot, logclient.ACT_DELETE, nil, self.UserCred, true) + logclient.AddActionLogWithStartable(self, snapshot, logclient.ACT_DELOCATE, nil, self.UserCred, true) self.SetStageComplete(ctx, nil) } diff --git a/pkg/compute/tasks/loadbalancer_acl_delete_task.go b/pkg/compute/tasks/loadbalancer_acl_delete_task.go index a57cda9645..cefb127636 100644 --- a/pkg/compute/tasks/loadbalancer_acl_delete_task.go +++ b/pkg/compute/tasks/loadbalancer_acl_delete_task.go @@ -25,7 +25,7 @@ func init() { func (self *LoadbalancerAclDeleteTask) taskFail(ctx context.Context, lbacl *models.SLoadbalancerAcl, reason string) { lbacl.SetStatus(self.GetUserCred(), consts.LB_STATUS_DELETE_FAILED, reason) db.OpsLog.LogEvent(lbacl, db.ACT_DELOCATE_FAIL, reason, self.UserCred) - logclient.AddActionLogWithStartable(self, lbacl, logclient.ACT_DELETE, reason, self.UserCred, false) + logclient.AddActionLogWithStartable(self, lbacl, logclient.ACT_DELOCATE, reason, self.UserCred, false) notifyclient.NotifySystemError(lbacl.Id, lbacl.Name, consts.LB_STATUS_DELETE_FAILED, reason) self.SetStageFailed(ctx, reason) } @@ -45,7 +45,7 @@ func (self *LoadbalancerAclDeleteTask) OnInit(ctx context.Context, obj db.IStand func (self *LoadbalancerAclDeleteTask) OnLoadbalancerAclDeleteComplete(ctx context.Context, lbacl *models.SLoadbalancerAcl, data jsonutils.JSONObject) { db.OpsLog.LogEvent(lbacl, db.ACT_DELETE, lbacl.GetShortDesc(ctx), self.UserCred) - logclient.AddActionLogWithStartable(self, lbacl, logclient.ACT_DELETE, nil, self.UserCred, true) + logclient.AddActionLogWithStartable(self, lbacl, logclient.ACT_DELOCATE, nil, self.UserCred, true) lbacl.DoPendingDelete(ctx, self.GetUserCred()) self.SetStageComplete(ctx, nil) } diff --git a/pkg/compute/tasks/loadbalancer_backendgroup_delete_task.go b/pkg/compute/tasks/loadbalancer_backendgroup_delete_task.go index 778096b7a8..578b382ddc 100644 --- a/pkg/compute/tasks/loadbalancer_backendgroup_delete_task.go +++ b/pkg/compute/tasks/loadbalancer_backendgroup_delete_task.go @@ -25,7 +25,7 @@ func init() { func (self *LoadbalancerBackendGroupDeleteTask) taskFail(ctx context.Context, lbbg *models.SLoadbalancerBackendGroup, reason string) { lbbg.SetStatus(self.GetUserCred(), consts.LB_STATUS_DELETE_FAILED, reason) db.OpsLog.LogEvent(lbbg, db.ACT_DELOCATE_FAIL, reason, self.UserCred) - logclient.AddActionLogWithStartable(self, lbbg, logclient.ACT_DELETE, reason, self.UserCred, false) + logclient.AddActionLogWithStartable(self, lbbg, logclient.ACT_DELOCATE, reason, self.UserCred, false) notifyclient.NotifySystemError(lbbg.Id, lbbg.Name, consts.LB_STATUS_DELETE_FAILED, reason) self.SetStageFailed(ctx, reason) } @@ -45,7 +45,7 @@ func (self *LoadbalancerBackendGroupDeleteTask) OnInit(ctx context.Context, obj func (self *LoadbalancerBackendGroupDeleteTask) OnLoadbalancerBackendGroupDeleteComplete(ctx context.Context, lbbg *models.SLoadbalancerBackendGroup, data jsonutils.JSONObject) { db.OpsLog.LogEvent(lbbg, db.ACT_DELETE, lbbg.GetShortDesc(ctx), self.UserCred) - logclient.AddActionLogWithStartable(self, lbbg, logclient.ACT_DELETE, nil, self.UserCred, true) + logclient.AddActionLogWithStartable(self, lbbg, logclient.ACT_DELOCATE, nil, self.UserCred, true) lbbg.PreDeleteSubs(ctx, self.GetUserCred()) self.SetStageComplete(ctx, nil) } diff --git a/pkg/compute/tasks/loadbalancer_certificate_delete_task.go b/pkg/compute/tasks/loadbalancer_certificate_delete_task.go index faabed16d0..5d3f5c8ac8 100644 --- a/pkg/compute/tasks/loadbalancer_certificate_delete_task.go +++ b/pkg/compute/tasks/loadbalancer_certificate_delete_task.go @@ -25,7 +25,7 @@ func init() { func (self *LoadbalancerCertificateDeleteTask) taskFail(ctx context.Context, lbcert *models.SLoadbalancerCertificate, reason string) { lbcert.SetStatus(self.GetUserCred(), consts.LB_STATUS_DELETE_FAILED, reason) db.OpsLog.LogEvent(lbcert, db.ACT_DELOCATE_FAIL, reason, self.UserCred) - logclient.AddActionLogWithStartable(self, lbcert, logclient.ACT_DELETE, reason, self.UserCred, false) + logclient.AddActionLogWithStartable(self, lbcert, logclient.ACT_DELOCATE, reason, self.UserCred, false) notifyclient.NotifySystemError(lbcert.Id, lbcert.Name, consts.LB_STATUS_DELETE_FAILED, reason) self.SetStageFailed(ctx, reason) } @@ -45,7 +45,7 @@ func (self *LoadbalancerCertificateDeleteTask) OnInit(ctx context.Context, obj d func (self *LoadbalancerCertificateDeleteTask) OnLoadbalancerCertificateDeleteComplete(ctx context.Context, lbcert *models.SLoadbalancerCertificate, data jsonutils.JSONObject) { db.OpsLog.LogEvent(lbcert, db.ACT_DELETE, lbcert.GetShortDesc(ctx), self.UserCred) - logclient.AddActionLogWithStartable(self, lbcert, logclient.ACT_DELETE, nil, self.UserCred, true) + logclient.AddActionLogWithStartable(self, lbcert, logclient.ACT_DELOCATE, nil, self.UserCred, true) lbcert.DoPendingDelete(ctx, self.GetUserCred()) self.SetStageComplete(ctx, nil) } diff --git a/pkg/compute/tasks/loadbalancer_delete_task.go b/pkg/compute/tasks/loadbalancer_delete_task.go index 1cf7b99ffb..6830c10d88 100644 --- a/pkg/compute/tasks/loadbalancer_delete_task.go +++ b/pkg/compute/tasks/loadbalancer_delete_task.go @@ -25,7 +25,7 @@ func init() { func (self *LoadbalancerDeleteTask) taskFail(ctx context.Context, lb *models.SLoadbalancer, reason string) { lb.SetStatus(self.GetUserCred(), consts.LB_STATUS_DELETE_FAILED, reason) db.OpsLog.LogEvent(lb, db.ACT_DELOCATE_FAIL, reason, self.UserCred) - logclient.AddActionLogWithStartable(self, lb, logclient.ACT_DELETE, reason, self.UserCred, false) + logclient.AddActionLogWithStartable(self, lb, logclient.ACT_DELOCATE, reason, self.UserCred, false) notifyclient.NotifySystemError(lb.Id, lb.Name, consts.LB_STATUS_DELETE_FAILED, reason) self.SetStageFailed(ctx, reason) } @@ -45,7 +45,7 @@ func (self *LoadbalancerDeleteTask) OnInit(ctx context.Context, obj db.IStandalo func (self *LoadbalancerDeleteTask) OnLoadbalancerDeleteComplete(ctx context.Context, lb *models.SLoadbalancer, data jsonutils.JSONObject) { db.OpsLog.LogEvent(lb, db.ACT_DELETE, lb.GetShortDesc(ctx), self.UserCred) - logclient.AddActionLogWithStartable(self, lb, logclient.ACT_DELETE, nil, self.UserCred, true) + logclient.AddActionLogWithStartable(self, lb, logclient.ACT_DELOCATE, nil, self.UserCred, true) lb.PendingDelete(ctx, self.GetUserCred()) self.SetStageComplete(ctx, nil) } diff --git a/pkg/compute/tasks/loadbalancer_listener_delete_task.go b/pkg/compute/tasks/loadbalancer_listener_delete_task.go index a93d0d0cf0..100ef27802 100644 --- a/pkg/compute/tasks/loadbalancer_listener_delete_task.go +++ b/pkg/compute/tasks/loadbalancer_listener_delete_task.go @@ -25,7 +25,7 @@ func init() { func (self *LoadbalancerListenerDeleteTask) taskFail(ctx context.Context, lblis *models.SLoadbalancerListener, reason string) { lblis.SetStatus(self.GetUserCred(), consts.LB_STATUS_DELETE_FAILED, reason) db.OpsLog.LogEvent(lblis, db.ACT_DELOCATE_FAIL, reason, self.UserCred) - logclient.AddActionLogWithStartable(self, lblis, logclient.ACT_DELETE, reason, self.UserCred, false) + logclient.AddActionLogWithStartable(self, lblis, logclient.ACT_DELOCATE, reason, self.UserCred, false) notifyclient.NotifySystemError(lblis.Id, lblis.Name, consts.LB_STATUS_DELETE_FAILED, reason) self.SetStageFailed(ctx, reason) } @@ -45,7 +45,7 @@ func (self *LoadbalancerListenerDeleteTask) OnInit(ctx context.Context, obj db.I func (self *LoadbalancerListenerDeleteTask) OnLoadbalancerListenerDeleteComplete(ctx context.Context, lblis *models.SLoadbalancerListener, data jsonutils.JSONObject) { db.OpsLog.LogEvent(lblis, db.ACT_DELETE, lblis.GetShortDesc(ctx), self.UserCred) - logclient.AddActionLogWithStartable(self, lblis, logclient.ACT_DELETE, nil, self.UserCred, true) + logclient.AddActionLogWithStartable(self, lblis, logclient.ACT_DELOCATE, nil, self.UserCred, true) lblis.PreDeleteSubs(ctx, self.GetUserCred()) self.SetStageComplete(ctx, nil) } diff --git a/pkg/compute/tasks/loadbalancer_listener_rule_delete_task.go b/pkg/compute/tasks/loadbalancer_listener_rule_delete_task.go index 21d8dfc0b1..f8355be21b 100644 --- a/pkg/compute/tasks/loadbalancer_listener_rule_delete_task.go +++ b/pkg/compute/tasks/loadbalancer_listener_rule_delete_task.go @@ -25,7 +25,7 @@ func init() { func (self *LoadbalancerListenerRuleDeleteTask) taskFail(ctx context.Context, lbr *models.SLoadbalancerListenerRule, reason string) { lbr.SetStatus(self.GetUserCred(), consts.LB_STATUS_DELETE_FAILED, reason) db.OpsLog.LogEvent(lbr, db.ACT_DELOCATE_FAIL, reason, self.UserCred) - logclient.AddActionLogWithStartable(self, lbr, logclient.ACT_DELETE, reason, self.UserCred, false) + logclient.AddActionLogWithStartable(self, lbr, logclient.ACT_DELOCATE, reason, self.UserCred, false) notifyclient.NotifySystemError(lbr.Id, lbr.Name, consts.LB_STATUS_DELETE_FAILED, reason) self.SetStageFailed(ctx, reason) } @@ -45,7 +45,7 @@ func (self *LoadbalancerListenerRuleDeleteTask) OnInit(ctx context.Context, obj func (self *LoadbalancerListenerRuleDeleteTask) OnLoadbalancerListenerRuleDeleteComplete(ctx context.Context, lbr *models.SLoadbalancerListenerRule, data jsonutils.JSONObject) { db.OpsLog.LogEvent(lbr, db.ACT_DELETE, lbr.GetShortDesc(ctx), self.UserCred) - logclient.AddActionLogWithStartable(self, lbr, logclient.ACT_DELETE, nil, self.UserCred, true) + logclient.AddActionLogWithStartable(self, lbr, logclient.ACT_DELOCATE, nil, self.UserCred, true) lbr.DoPendingDelete(ctx, self.GetUserCred()) self.SetStageComplete(ctx, nil) } diff --git a/pkg/util/logclient/logclient.go b/pkg/util/logclient/logclient.go index 5ed1f90ecf..f463b6b6cc 100644 --- a/pkg/util/logclient/logclient.go +++ b/pkg/util/logclient/logclient.go @@ -21,6 +21,19 @@ import ( "yunion.io/x/onecloud/pkg/mcclient/modules" ) +// 这些状态不做 websocket 通知 +var BlackList = []string{ + ACT_CLOUD_FULLSYNC, + ACT_CREATE, + ACT_DELETE, + ACT_PENDING_DELETE, + ACT_PRIVATE, + ACT_PUBLIC, + ACT_UPDATE, + ACT_VM_SYNC_STATUS, + ACT_VM_SYNC_CONF, +} + const ( ACT_ADDTAG = "添加标签" ACT_ALLOCATE = "分配"