Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Rainbond2
Commits
16e6bc44
Commit
16e6bc44
authored
5 years ago
by
凡羊羊
Browse files
Options
Download
Email Patches
Plain Diff
[FIX] fix issue bug(#330) check if nil or not before use config
parent
d4a49a18
main
Develop-V5.X
V5.1
V5.2
V5.3
V5.4
dependabot/npm_and_yarn/webcli/js/xterm-4.5.0
feat-V5.10
feat-V5.10.1
feat-containerd
feat-containerd1
feature-helmapp
feature-helmapp-2
feature-k8s
fixbug-560
master
mesh-start
servicemonitor
zqhtest-containerd
v5.10.0-release
v5.9.0-release
v5.8.1-release
v5.8.0-release
v5.7.1-release
v5.7.0-release
v5.6.0-release
v5.5.0-release
v5.5.0-dind
v5.4.1-release
v5.4.0-release
v5.3.3-release
v5.3.2-release
v5.3.1-release
v5.3.0-release
v5.2.2-release
v5.2.1-release
v5.2.0-release
v5.2.0-beta2
v5.2.0-beta1
v5.1.11-release
v5.1.10-release
v5.1.9-release
v5.1.8-release
v5.1.6-release
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
worker/appm/conversion/plugin.go
+5
-3
worker/appm/conversion/plugin.go
with
5 additions
and
3 deletions
+5
-3
worker/appm/conversion/plugin.go
+
5
-
3
View file @
16e6bc44
...
...
@@ -128,9 +128,11 @@ func conversionServicePlugin(as *typesv1.AppService, dbmanager db.Manager) ([]v1
if
err
!=
nil
&&
err
!=
gorm
.
ErrRecordNotFound
{
logrus
.
Errorf
(
"get service plugin config from db failure %s"
,
err
.
Error
())
}
var
resourceConfig
api_model
.
ResourceSpec
if
err
:=
json
.
Unmarshal
([]
byte
(
config
.
ConfigStr
),
&
resourceConfig
);
err
==
nil
{
inboundPluginConfig
=
&
resourceConfig
if
config
!=
nil
{
var
resourceConfig
api_model
.
ResourceSpec
if
err
:=
json
.
Unmarshal
([]
byte
(
config
.
ConfigStr
),
&
resourceConfig
);
err
==
nil
{
inboundPluginConfig
=
&
resourceConfig
}
}
}
//create plugin config to configmap
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help