From cd3f46871adbcd3f860a4086af7720fa0c30526a Mon Sep 17 00:00:00 2001
From: Qiu Jian <qiujian@yunionyun.com>
Date: Thu, 27 Dec 2018 00:05:57 +0800
Subject: [PATCH] minor fixes

---
 pkg/appsrv/appparams.go             | 2 +-
 pkg/appsrv/appsrv.go                | 1 -
 pkg/cloudcommon/db/db_dispatcher.go | 2 +-
 pkg/cloudcommon/db/interface.go     | 2 +-
 pkg/cloudcommon/db/modelbase.go     | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkg/appsrv/appparams.go b/pkg/appsrv/appparams.go
index 6a9b274503..6252fd7085 100644
--- a/pkg/appsrv/appparams.go
+++ b/pkg/appsrv/appparams.go
@@ -23,7 +23,7 @@ type SAppParams struct {
 
 	OverrideResponseBodyWrapper bool
 
-	Cancel context.CancelFunc
+	// Cancel context.CancelFunc
 }
 
 func AppContextGetParams(ctx context.Context) *SAppParams {
diff --git a/pkg/appsrv/appsrv.go b/pkg/appsrv/appsrv.go
index fd9f611d09..1a1b9ada56 100644
--- a/pkg/appsrv/appsrv.go
+++ b/pkg/appsrv/appsrv.go
@@ -225,7 +225,6 @@ func (app *Application) defaultHandle(w http.ResponseWriter, r *http.Request, ri
 			appParams := hand.GetAppParams(params, segs)
 			appParams.Request = r
 			appParams.Response = w
-			appParams.Cancel = cancel
 			session.Run(
 				func() {
 					if ctx.Err() == nil {
diff --git a/pkg/cloudcommon/db/db_dispatcher.go b/pkg/cloudcommon/db/db_dispatcher.go
index 3bbd051287..9a8b2b3a45 100644
--- a/pkg/cloudcommon/db/db_dispatcher.go
+++ b/pkg/cloudcommon/db/db_dispatcher.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 	"reflect"
 	"strings"
 
@@ -14,7 +15,6 @@ import (
 	"yunion.io/x/pkg/utils"
 	"yunion.io/x/sqlchemy"
 
-	"net/http"
 	"yunion.io/x/onecloud/pkg/appsrv"
 	"yunion.io/x/onecloud/pkg/cloudcommon/consts"
 	"yunion.io/x/onecloud/pkg/cloudcommon/db/lockman"
diff --git a/pkg/cloudcommon/db/interface.go b/pkg/cloudcommon/db/interface.go
index a23e87d78c..841ee1f18b 100644
--- a/pkg/cloudcommon/db/interface.go
+++ b/pkg/cloudcommon/db/interface.go
@@ -2,12 +2,12 @@ package db
 
 import (
 	"context"
+	"net/http"
 
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/sqlchemy"
 
-	"net/http"
 	"yunion.io/x/onecloud/pkg/appsrv"
 	"yunion.io/x/onecloud/pkg/cloudcommon/db/lockman"
 )
diff --git a/pkg/cloudcommon/db/modelbase.go b/pkg/cloudcommon/db/modelbase.go
index 6250ac07de..9ef211a4f3 100644
--- a/pkg/cloudcommon/db/modelbase.go
+++ b/pkg/cloudcommon/db/modelbase.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-
 	"net/http"
+
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/onecloud/pkg/appsrv"
 	"yunion.io/x/onecloud/pkg/mcclient"