Load config before connecting to mumble server
This commit is contained in:
parent
c05967047c
commit
fbd355afaa
21
main.go
21
main.go
|
@ -44,12 +44,6 @@ func (dj *mumbledj) OnConnect(e *gumble.ConnectEvent) {
|
|||
fmt.Println("Channel doesn't exist or one was not provided, staying in root channel...")
|
||||
}
|
||||
|
||||
if err := loadConfiguration(); err == nil {
|
||||
fmt.Println("Configuration successfully loaded!")
|
||||
} else {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
if audioStream, err := gumble_ffmpeg.New(dj.client); err == nil {
|
||||
dj.audioStream = audioStream
|
||||
dj.audioStream.Volume = dj.conf.Volume.DefaultVolume
|
||||
|
@ -149,6 +143,17 @@ var dj = mumbledj{
|
|||
// Main function, but only really performs startup tasks. Grabs and parses commandline
|
||||
// args, sets up the gumble client and its listeners, and then connects to the server.
|
||||
func main() {
|
||||
|
||||
if currentUser, err := user.Current(); err == nil {
|
||||
dj.homeDir = currentUser.HomeDir
|
||||
}
|
||||
|
||||
if err := loadConfiguration(); err == nil {
|
||||
fmt.Println("Configuration successfully loaded!")
|
||||
} else {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
var address, port, username, password, channel, pemCert, pemKey string
|
||||
var insecure bool
|
||||
|
||||
|
@ -169,10 +174,6 @@ func main() {
|
|||
}
|
||||
dj.client = gumble.NewClient(&dj.config)
|
||||
|
||||
if currentUser, err := user.Current(); err == nil {
|
||||
dj.homeDir = currentUser.HomeDir
|
||||
}
|
||||
|
||||
dj.config.TLSConfig.InsecureSkipVerify = true
|
||||
if !insecure {
|
||||
gumbleutil.CertificateLockFile(dj.client, fmt.Sprintf("%s/.mumbledj/cert.lock", dj.homeDir))
|
||||
|
|
Reference in a new issue