This commit is contained in:
Aaron Lindsay 2013-08-27 09:41:55 -04:00
parent 219eecbfda
commit 7009b0eda8
3 changed files with 8 additions and 8 deletions

View File

@ -1,9 +1,9 @@
package main package main
import ( import (
"log"
"net" "net"
"net/rpc" "net/rpc"
"log"
"syscall" "syscall"
) )
@ -13,9 +13,9 @@ func RPCCall(method string, args interface{}, reply interface{}) error {
if err != nil { if err != nil {
if err2, ok := err.(*net.OpError); ok { if err2, ok := err.(*net.OpError); ok {
if err2.Err == syscall.ENOENT { if err2.Err == syscall.ENOENT {
log.Fatal("The socket ("+socket+") was not found") log.Fatal("The socket (" + socket + ") was not found")
} else if err2.Err == syscall.ECONNREFUSED { } else if err2.Err == syscall.ECONNREFUSED {
log.Fatal("A connection was refused to "+socket+". Please check the permissions and ensure the server is running.") log.Fatal("A connection was refused to " + socket + ". Please check the permissions and ensure the server is running.")
} }
} }
return err return err

View File

@ -5,9 +5,9 @@ import (
"code.google.com/p/gopass" "code.google.com/p/gopass"
"flag" "flag"
"fmt" "fmt"
"net/rpc"
"os" "os"
"strconv" "strconv"
"net/rpc"
) )
type boolIsSetFlag struct { type boolIsSetFlag struct {
@ -70,7 +70,7 @@ func UserAdd(args []string) {
err = RPCCall("UserModifier.AddUser", user, &i) err = RPCCall("UserModifier.AddUser", user, &i)
if err != nil { if err != nil {
if _, ok := err.(rpc.ServerError); ok && err.Error() == server.DuplicateUsernameErr.Error() { if _, ok := err.(rpc.ServerError); ok && err.Error() == server.DuplicateUsernameErr.Error() {
fmt.Println("Error: "+err.Error()) fmt.Println("Error: " + err.Error())
return return
} }
panic(err) panic(err)
@ -90,7 +90,7 @@ func UserDel(args []string) {
err := RPCCall("UserModifier.RemoveUser", user, &i) err := RPCCall("UserModifier.RemoveUser", user, &i)
if err != nil { if err != nil {
if _, ok := err.(rpc.ServerError); ok && err.Error() == server.NoUserErr.Error() { if _, ok := err.(rpc.ServerError); ok && err.Error() == server.NoUserErr.Error() {
fmt.Println("Error: "+err.Error()) fmt.Println("Error: " + err.Error())
return return
} }
panic(err) panic(err)
@ -157,7 +157,7 @@ func UserMod(args []string) {
err := RPCCall("UserModifier.ModifyUser", rpcargs, &i) err := RPCCall("UserModifier.ModifyUser", rpcargs, &i)
if err != nil { if err != nil {
if _, ok := err.(rpc.ServerError); ok && err.Error() == server.NoUserErr.Error() { if _, ok := err.(rpc.ServerError); ok && err.Error() == server.NoUserErr.Error() {
fmt.Println("Error: "+err.Error()) fmt.Println("Error: " + err.Error())
return return
} }
panic(err) panic(err)

View File

@ -2,8 +2,8 @@ package server
import ( import (
"asink" "asink"
"errors"
"database/sql" "database/sql"
"errors"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
"sync" "sync"
) )