|
@@ -1,9 +1,10 @@
|
|
package nginx
|
|
package nginx
|
|
|
|
|
|
import (
|
|
import (
|
|
- "github.com/tufanbarisyildirim/gonginx/config"
|
|
|
|
- "path"
|
|
|
|
|
|
+ "path/filepath"
|
|
"strings"
|
|
"strings"
|
|
|
|
+
|
|
|
|
+ "github.com/tufanbarisyildirim/gonginx/config"
|
|
)
|
|
)
|
|
|
|
|
|
type NgxConfig struct {
|
|
type NgxConfig struct {
|
|
@@ -45,7 +46,6 @@ func (d *NgxDirective) Orig() string {
|
|
|
|
|
|
func (d *NgxDirective) TrimParams() {
|
|
func (d *NgxDirective) TrimParams() {
|
|
d.Params = strings.TrimRight(strings.TrimSpace(d.Params), ";")
|
|
d.Params = strings.TrimRight(strings.TrimSpace(d.Params), ";")
|
|
- return
|
|
|
|
}
|
|
}
|
|
|
|
|
|
func NewNgxServer() *NgxServer {
|
|
func NewNgxServer() *NgxServer {
|
|
@@ -59,6 +59,6 @@ func NewNgxConfig(filename string) *NgxConfig {
|
|
return &NgxConfig{
|
|
return &NgxConfig{
|
|
FileName: filename,
|
|
FileName: filename,
|
|
Upstreams: make([]*NgxUpstream, 0),
|
|
Upstreams: make([]*NgxUpstream, 0),
|
|
- Name: path.Base(filename),
|
|
|
|
|
|
+ Name: filepath.Base(filename),
|
|
}
|
|
}
|
|
}
|
|
}
|