External/grumble
1
0
Fork 1
mirror of https://github.com/mumble-voip/grumble.git synced 2025-12-20 14:20:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

More Go 1 updates.

Browse source
This commit is contained in:
Mikkel Krautz 2012-03-06 01:07:10 +01:00
parent e46a65109f
commit fee67fa856
7 changed files with 40 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

40
grumble.go
View file

@ -54,16 +54,8 @@ func main() {
// and will return an error if something's amiss.
blobDir := filepath.Join(Args.DataDir, "blob")
err = os.Mkdir(blobDir, 0700)
if err != nil {
exists := false
if e, ok := err.(*os.PathError); ok {
if e.Err == os.EEXIST {
exists = true
}
}
if !exists {
log.Fatal("Unable to create blob directory: %v", err.Error())
}
if err != nil && !os.IsExist(err) {
log.Fatal("Unable to create blob directory: %v", err.Error())
}
err = blobstore.Open(blobDir)
if err != nil {
@ -88,20 +80,12 @@ func main() {
hasKey := true
hasCert := true
_, err = os.Stat(certFn)
if err != nil {
if e, ok := err.(*os.PathError); ok {
if e.Err == os.ENOENT {
hasCert = false
}
}
if err != nil && os.IsNotExist(err) {
hasCert = false
}
_, err = os.Stat(keyFn)
if err != nil {
if e, ok := err.(*os.PathError); ok {
if e.Err == os.ENOENT {
hasKey = false
}
}
if err != nil && os.IsNotExist(err) {
hasKey = false
}
if !hasCert && !hasKey {
shouldRegen = true
@ -167,16 +151,8 @@ func main() {
// exist.
serversDirPath := filepath.Join(Args.DataDir, "servers")
err = os.Mkdir(serversDirPath, 0700)
if err != nil {
exists := false
if e, ok := err.(*os.PathError); ok {
if e.Err == os.EEXIST {
exists = true
}
}
if !exists {
log.Fatal("Unable to create servers directory: %v", err.Error())
}
if err != nil && !os.IsExist(err) {
log.Fatal("Unable to create servers directory: %v", err.Error())
}
// Read all entries of the servers directory.