Commit Graph

90 Commits

Author SHA1 Message Date
Qiu Jian
a6b865e7a2 修正:1. sql.Rows使用后未关闭,导致占用db链接 2.
服务启动后,调用AppDBInit方法设置db连接池上限,避免耗尽mysql连接
3.
app和workmanager增加db属性,用来标示该worker和app是否使用数据库,从而估计需要设置的数据库连接的上限
2018-12-21 17:10:34 +08:00
Qiu Jian
965e84ea36 update 2018-12-07 02:57:58 +08:00
Qiu Jian
c292a1e311 Merge branch 'release/2.3.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.4.0-20181203
Conflicts:
	pkg/compute/models/storages.go
2018-12-03 07:18:27 +08:00
wanyaoqi
ecc750107b fix conflict 2018-12-01 16:18:11 +08:00
TangBin
a543901e2f yunionconfig build error fix 2018-12-01 14:52:01 +08:00
Qiu Jian
bc02b3b433 1.
取消userCred.IsSystemAdmin(),在使用policy的应用中,通过userCred.IsAdminAllow判断是否是管理员且具备相应的权限。获取token时,需要传入policy.FilterPolicyCredential,将普通userCred转换成支持rbac的userCred
2. 在应用启动时候,必须设置 SetServiceType,否则退出
2018-11-30 23:00:11 +08:00
屈轩
45ddeaf084 补充腾讯云webconsole 2018-11-30 17:08:39 +08:00
邱剑
549fbbb6b1 Automatic merge from release/2.3.0 -> release/2.4.0
* commit 'f9899a6e59c7b3ab1ef9581e7fe4340da22225b1':
  忽略known_hosts影响
2018-11-30 16:05:02 +08:00
屈轩
7caeab976c 忽略known_hosts影响 2018-11-30 16:04:08 +08:00
邱剑
84ca24fed0 Automatic merge from release/2.3.0 -> release/2.4.0
* commit '70c2b8255796b292a3fe91788b6dc0486a24aec3':
  忽略known_hosts记录
2018-11-30 15:48:50 +08:00
邱剑
70c2b82557 Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'b51cb3a1cf8493cd3085b6268711d4d568d47e15':
  忽略known_hosts记录
2018-11-30 15:48:50 +08:00
屈轩
0e68f6d486 冲突解决 2018-11-30 15:33:33 +08:00
屈轩
223c5aeb35 忽略known_hosts记录 2018-11-30 15:23:40 +08:00
Yousong Zhou
3213cf047a webconsole: 修正httperrors.GeneralServerError调用 2018-11-30 03:07:01 +00:00
Yousong Zhou
72761eb3ac webconsole: 改进protocol检查 2018-11-30 03:07:01 +00:00
Yousong Zhou
5d2ef3ab41 treewide: httperrors: 使用http.ResposneWriter时保留msg fmt 2018-11-28 07:39:55 +00:00
屈轩
8e9105d115 使用系统密钥 2018-11-17 12:15:31 +08:00
邱剑
b3221c24bf Merge pull request #513 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-webssh-xterm to release/2.3.0
* commit '174d13274388df3697d5aa7a0bab03e491249b97':
  替换使用xterm-256color
2018-11-15 20:15:30 +08:00
邱剑
5f9bd7faf8 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '609d0a997590c192151d85346c6a1a849c571cd9':
  替换使用xterm-256color
2018-11-15 20:15:17 +08:00
屈轩
174d132743 替换使用xterm-256color 2018-11-15 20:12:44 +08:00
屈轩
7c15b8d2fb 替换使用xterm-256color 2018-11-15 20:10:59 +08:00
Qiu Jian
5a6b4832ea make webconsole ssl capable 2018-11-03 00:42:33 +08:00
李泽玺
2a7775dcf9 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '72b3e390960980ca665030b631b0ab7697e35d7b':
  设置sshpass默认安装路径
2018-10-30 14:30:40 +08:00
屈轩
a3453a414c 设置sshpass默认安装路径 2018-10-30 14:29:46 +08:00
屈轩
24a6a47ebc 支持ssh秘钥尝试登陆 2018-10-29 23:23:56 +08:00
邱剑
46dc114e76 Merge pull request #376 in YUNIONIO/onecloud from ~QUXUAN/onecloud:release/2.2.0 to release/2.2.0
* commit 'd525cea91689fcd47e68d836c1900bab1563a7bf':
  避免instance 缓存disk数据
2018-10-29 22:37:29 +08:00
邱剑
ee9038e533 Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'e5acfe5f989a96d2c67a092b7bd7d2935ca3fac5':
  避免ssh登陆失败
2018-10-27 17:30:26 +08:00
屈轩
8cd89e90d4 避免ssh登陆失败 2018-10-27 15:39:47 +08:00
Zexi Li
aad9d13cca reuse appsrv.FetchEnv method 2018-10-25 12:14:37 +08:00
Zexi Li
cb11950f4f webconsole: websockify support base64 subprotocol 2018-10-20 17:07:20 +08:00
Zexi Li
948a1895c7 webconsole: websockify adapt graphic protocol like vnc protocol 2018-10-20 15:58:12 +08:00
屈轩
28d59c5ebd 添加超时处理 2018-09-29 16:50:08 +08:00
屈轩
9673892de0 添加admin参数 2018-09-21 15:12:59 +08:00
屈轩
18f6c065e1 支持ssh webconsole 2018-09-21 15:05:24 +08:00
Zexi Li
1fba463cda - use sh to connect k8s pod
- ensure required binaries exist
2018-09-12 11:00:08 +08:00
Zexi Li
94a5eedae4 webconsole: support baremetal ipmitool sol 2018-09-05 18:14:08 +08:00
Zexi Li
955fe9b2e3 webconsole: use external frontend 2018-09-05 16:09:04 +08:00
Zexi Li
2c28b22f67 - remove unused code
- add rpm build files
2018-09-04 19:21:52 +08:00
Zexi Li
f027ceeff7 vendor added 2018-09-04 19:12:11 +08:00
Zexi Li
a6736da35e webterm init 2018-09-04 18:44:52 +08:00