Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
077eab1b
Unverified
Commit
077eab1b
authored
Oct 22, 2020
by
Arve Knudsen
Committed by
GitHub
Oct 22, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Chore: Use net.JoinHostPort (#28421)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
parent
020dde53
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
pkg/api/http_server.go
+1
-1
pkg/services/ldap/ldap.go
+3
-1
No files found.
pkg/api/http_server.go
View file @
077eab1b
...
...
@@ -107,7 +107,7 @@ func (hs *HTTPServer) Run(ctx context.Context) error {
hs
.
applyRoutes
()
hs
.
httpSrv
=
&
http
.
Server
{
Addr
:
fmt
.
Sprintf
(
"%s:%s"
,
setting
.
HttpAddr
,
setting
.
HttpPort
),
Addr
:
net
.
JoinHostPort
(
setting
.
HttpAddr
,
setting
.
HttpPort
),
Handler
:
hs
.
macaron
,
}
switch
setting
.
Protocol
{
...
...
pkg/services/ldap/ldap.go
View file @
077eab1b
...
...
@@ -7,6 +7,8 @@ import (
"fmt"
"io/ioutil"
"math"
"net"
"strconv"
"strings"
"github.com/davecgh/go-spew/spew"
...
...
@@ -110,7 +112,7 @@ func (server *Server) Dial() error {
}
}
for
_
,
host
:=
range
strings
.
Split
(
server
.
Config
.
Host
,
" "
)
{
address
:=
fmt
.
Sprintf
(
"%s:%d"
,
host
,
server
.
Config
.
Port
)
address
:=
net
.
JoinHostPort
(
host
,
strconv
.
Itoa
(
server
.
Config
.
Port
)
)
if
server
.
Config
.
UseSSL
{
tlsCfg
:=
&
tls
.
Config
{
InsecureSkipVerify
:
server
.
Config
.
SkipVerifySSL
,
...
...
Write
Preview
Markdown
is supported
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