[Merge] lp:~sergiusens/nuntium/stdout_cleanup into lp:nuntium
Sergio Schvezov
sergio.schvezov at canonical.com
Wed Jul 2 09:00:06 UTC 2014
Diff comments:
> === modified file 'mediator.go'
> --- mediator.go 2014-07-01 12:33:46 +0000
> +++ mediator.go 2014-07-01 12:33:46 +0000
> @@ -150,7 +150,7 @@
> dec := mms.NewDecoder(pushMsg.Data)
> mNotificationInd := mms.NewMNotificationInd()
> if err := dec.Decode(mNotificationInd); err != nil {
> - log.Print("Unable to decode m-notification.ind: ", err)
> + log.Println("Unable to decode m-notification.ind: ", err, "with log", dec.GetLog())
> return
> }
> storage.Create(mNotificationInd.UUID, mNotificationInd.ContentLocation)
> @@ -198,7 +198,7 @@
> mRetrieveConf := mms.NewMRetrieveConf(uuid)
> dec := mms.NewDecoder(mmsData)
> if err := dec.Decode(mRetrieveConf); err != nil {
> - log.Print("Unable to decode m-retrieve.conf: ", err)
> + log.Println("Unable to decode m-retrieve.conf: ", err, "with log", dec.GetLog())
> return
> }
> mediator.NewMRetrieveConf <- mRetrieveConf
>
> === modified file 'mms/attachments.go'
> --- mms/attachments.go 2014-07-01 12:33:46 +0000
> +++ mms/attachments.go 2014-07-01 12:33:46 +0000
> @@ -25,6 +25,7 @@
> "errors"
> "fmt"
> "io/ioutil"
> + "log"
> "path/filepath"
> "reflect"
> "strings"
> @@ -128,9 +129,8 @@
> return err
> }
> var dataParts []Attachment
> - fmt.Println("Number of parts", parts)
> + dec.log = dec.log + fmt.Sprintf("Number of parts: %d\n", parts)
> for i := uint64(0); i < parts; i++ {
> - fmt.Println("\nPart", i, "\n")
> headerLen, err := dec.ReadUintVar(nil, "")
> if err != nil {
> return err
> @@ -140,7 +140,7 @@
> return err
> }
> headerEnd := dec.Offset + int(headerLen)
> - fmt.Println("header len:", headerLen, "dataLen:", dataLen, "headerEnd:", headerEnd)
> + dec.log = dec.log + fmt.Sprintf("Attachament len(header): %d - len(data) %d\n", headerLen, dataLen)
> var ct Attachment
> ct.Offset = headerEnd + 1
> ctReflected := reflect.ValueOf(&ct).Elem()
> @@ -156,7 +156,7 @@
> return err
> }
> if ct.MediaType == "application/smil" || strings.HasPrefix(ct.MediaType, "text/plain") || ct.MediaType == "" {
> - fmt.Printf("%s\n", ct.Data)
> + dec.log = dec.log + fmt.Sprintf("%s\n", ct.Data)
> }
> if ct.Charset != "" {
> ct.MediaType = ct.MediaType + ";charset=" + ct.Charset
> @@ -205,7 +205,7 @@
> if length, err = dec.ReadLength(ctMember); err != nil {
> return err
> }
> - fmt.Println("Content Type Length:", length)
> + dec.log = dec.log + fmt.Sprintf("Content Type Length: %d\n", length)
> endOffset := int(length) + dec.Offset
>
> if err := dec.ReadMediaType(ctMember, "MediaType"); err != nil {
> @@ -214,7 +214,7 @@
>
> for dec.Offset < len(dec.Data) && dec.Offset < endOffset {
> param, _ := dec.ReadInteger(nil, "")
> - fmt.Printf("offset %d, value: %#x, param %#x\n", dec.Offset, dec.Data[dec.Offset], param)
> + //fmt.Printf("offset %d, value: %#x, param %#x\n", dec.Offset, dec.Data[dec.Offset], param)
I just keep this handy for debugging :-P
> switch param {
> case WSP_PARAMETER_TYPE_Q:
> err = dec.ReadQ(ctMember)
> @@ -225,10 +225,10 @@
> case WSP_PARAMETER_TYPE_TYPE:
> _, err = dec.ReadInteger(ctMember, "Type")
> case WSP_PARAMETER_TYPE_NAME_DEFUNCT:
> - fmt.Println("Name(deprecated)")
> + log.Println("Using deprecated Name header")
> _, err = dec.ReadString(ctMember, "Name")
> case WSP_PARAMETER_TYPE_FILENAME_DEFUNCT:
> - fmt.Println("FileName(deprecated)")
> + log.Println("Using deprecated FileName header")
> _, err = dec.ReadString(ctMember, "FileName")
> case WSP_PARAMETER_TYPE_DIFFERENCES:
> err = errors.New("Unhandled Differences")
> @@ -237,27 +237,27 @@
> case WSP_PARAMETER_TYPE_CONTENT_TYPE:
> _, err = dec.ReadString(ctMember, "Type")
> case WSP_PARAMETER_TYPE_START_DEFUNCT:
> - fmt.Println("Start(deprecated)")
> + log.Println("Using deprecated Start header")
> _, err = dec.ReadString(ctMember, "Start")
> case WSP_PARAMETER_TYPE_START_INFO_DEFUNCT:
> - fmt.Println("Start Info(deprecated")
> + log.Println("Using deprecated StartInfo header")
> _, err = dec.ReadString(ctMember, "StartInfo")
> case WSP_PARAMETER_TYPE_COMMENT_DEFUNCT:
> - fmt.Println("Comment(deprecated")
> + log.Println("Using deprecated Comment header")
> _, err = dec.ReadString(ctMember, "Comment")
> case WSP_PARAMETER_TYPE_DOMAIN_DEFUNCT:
> - fmt.Println("Domain(deprecated)")
> + log.Println("Using deprecated Domain header")
> _, err = dec.ReadString(ctMember, "Domain")
> case WSP_PARAMETER_TYPE_MAX_AGE:
> err = errors.New("Unhandled Max Age")
> case WSP_PARAMETER_TYPE_PATH_DEFUNCT:
> - fmt.Println("Path(deprecated)")
> + log.Println("Using deprecated Path header")
> _, err = dec.ReadString(ctMember, "Path")
> case WSP_PARAMETER_TYPE_SECURE:
> - fmt.Println("Secure")
> + log.Println("Unhandled Secure header detected")
> case WSP_PARAMETER_TYPE_SEC:
> v, _ := dec.ReadShortInteger(nil, "")
> - fmt.Println("SEC(deprecated)", v)
> + log.Println("Using deprecated and unhandled Sec header with value", v)
> case WSP_PARAMETER_TYPE_MAC:
> err = errors.New("Unhandled MAC")
> case WSP_PARAMETER_TYPE_CREATION_DATE:
> @@ -282,7 +282,7 @@
> _, err = dec.ReadString(ctMember, "Path")
> case WSP_PARAMETER_TYPE_UNTYPED:
> v, _ := dec.ReadString(nil, "")
> - fmt.Println("Untyped", v)
> + log.Println("Unhandled Secure header detected with value", v)
> default:
> err = fmt.Errorf("Unhandled parameter %#x == %d at offset %d", param, param, dec.Offset)
> }
>
> === modified file 'mms/decode-cli/decode.go'
> --- mms/decode-cli/decode.go 2014-07-01 12:33:46 +0000
> +++ mms/decode-cli/decode.go 2014-07-01 12:33:46 +0000
> @@ -42,6 +42,8 @@
> fmt.Println("Saving to", targetPath)
> writeParts(targetPath, retConfHdr.Attachments)
> }
> +
> + fmt.Println(dec.GetLog())
> }
>
> func usage() {
>
> === modified file 'mms/decoder.go'
> --- mms/decoder.go 2014-07-01 12:33:46 +0000
> +++ mms/decoder.go 2014-07-01 12:33:46 +0000
> @@ -33,6 +33,7 @@
> type MMSDecoder struct {
> Data []byte
> Offset int
> + log string
> }
>
> func (dec *MMSDecoder) ReadEncodedString(reflectedPdu *reflect.Value, hdr string) (string, error) {
> @@ -55,7 +56,7 @@
> if err != nil {
> return "", err
> }
> - fmt.Println("Next string encoded with:", charset)
> + dec.log = dec.log + fmt.Sprintf("Next string encoded with: %s\n", charset)
> }
> var str string
> if str, err = dec.ReadString(reflectedPdu, hdr); err != nil {
> @@ -130,7 +131,7 @@
> }
>
> reflectedPdu.FieldByName(hdr).SetString(mediaType)
> - fmt.Print(hdr, ": ", mediaType, "\n")
> + dec.log = dec.log + fmt.Sprintf("%s: %s\n", hdr, mediaType)
> return nil
> }
>
> @@ -164,7 +165,7 @@
> v := string(dec.Data[begin:dec.Offset])
> if hdr != "" {
> reflectedPdu.FieldByName(hdr).SetString(v)
> - fmt.Printf("Setting %s to %s\n", hdr, v)
> + dec.log = dec.log + fmt.Sprintf("Setting %s to %s\n", hdr, v)
> }
> return v, nil
> }
> @@ -180,7 +181,7 @@
> v := dec.Data[dec.Offset] & 0x7F
> if hdr != "" {
> reflectedPdu.FieldByName(hdr).SetUint(uint64(v))
> - fmt.Printf("Setting %s to %#x == %d\n", hdr, v, v)
> + dec.log = dec.log + fmt.Sprintf("Setting %s to %#x == %d\n", hdr, v, v)
> }
> return v, nil
> }
> @@ -190,7 +191,7 @@
> v := dec.Data[dec.Offset]
> if hdr != "" {
> reflectedPdu.FieldByName(hdr).SetUint(uint64(v))
> - fmt.Printf("Setting %s to %#x == %d\n", hdr, v, v)
> + dec.log = dec.log + fmt.Sprintf("Setting %s to %#x == %d\n", hdr, v, v)
> }
> return v, nil
> }
> @@ -200,7 +201,7 @@
> v := []byte(dec.Data[dec.Offset:])
> if hdr != "" {
> reflectedPdu.FieldByName(hdr).SetBytes(v)
> - fmt.Printf("Setting %s to %#x == %d\n", hdr, v, v)
> + dec.log = dec.log + fmt.Sprintf("Setting %s to %#x == %d\n", hdr, v, v)
> }
> return v, nil
> }
> @@ -229,7 +230,7 @@
> value |= uint64(dec.Data[dec.Offset] & 0x7F)
> if hdr != "" {
> reflectedPdu.FieldByName(hdr).SetUint(value)
> - fmt.Printf("Setting %s to %d\n", hdr, value)
> + dec.log = dec.log + fmt.Sprintf("Setting %s to %d\n", hdr, value)
> }
> return value, nil
> }
> @@ -248,7 +249,7 @@
> }
> if hdr != "" {
> reflectedPdu.FieldByName(hdr).SetUint(v)
> - fmt.Printf("Setting %s to %d\n", hdr, v)
> + dec.log = dec.log + fmt.Sprintf("Setting %s to %d\n", hdr, v)
> }
> return v, err
> }
> @@ -266,7 +267,7 @@
> }
> if hdr != "" {
> reflectedPdu.FieldByName(hdr).SetUint(uint64(v))
> - fmt.Printf("Setting %s to %d\n", hdr, v)
> + dec.log = dec.log + fmt.Sprintf("Setting %s to %d\n", hdr, v)
> }
> return v, nil
> }
> @@ -289,7 +290,7 @@
> if value, err = dec.ReadString(nil, ""); err != nil {
> return 0, false, err
> }
> - fmt.Println("Ignoring application header:", param, ":", value)
> + dec.log = dec.log + fmt.Sprintf("Ignoring application header: %#x: %s", param, value)
> return 0, false, nil
> }
> }
> @@ -347,9 +348,9 @@
> val = (val << 8) | uint(dec.Data[dec.Offset])
> }
> // TODO add switch case for token
> - fmt.Printf("Expiry token: %x\n", token)
> + dec.log = dec.log + fmt.Sprintf("Expiry token: %x\n", token)
> reflectedPdu.FieldByName("Expiry").SetUint(uint64(val))
> - fmt.Printf("Message Expiry %d, %x\n", val, dec.Data[dec.Offset])
> + dec.log = dec.log + fmt.Sprintf("Message Expiry %d, %x\n", val, dec.Data[dec.Offset])
> case X_MMS_TRANSACTION_ID:
> _, err = dec.ReadString(&reflectedPdu, "TransactionId")
> case CONTENT_TYPE:
> @@ -402,8 +403,7 @@
> case DATE:
> _, err = dec.ReadLongInteger(&reflectedPdu, "Date")
> default:
> - fmt.Printf("Unhandled byte: %#0x\tdec: %d\tdec.Offset: %d\n", param, param, dec.Offset)
> - return fmt.Errorf("Unhandled byte: %#0x\tdec: %d\tdec.Offset: %d\n", param, param, dec.Offset)
> + return fmt.Errorf("Unhandled byte: %#0x\tdec: %d\tdec.Offset: %d ... decoded so far: %s", param, param, dec.Offset)
> }
> if err != nil {
> return err
> @@ -411,3 +411,7 @@
> }
> return nil
> }
> +
> +func (dec *MMSDecoder) GetLog() string {
> + return dec.log
> +}
>
> === modified file 'mms/encoder.go'
> --- mms/encoder.go 2014-07-01 12:33:46 +0000
> +++ mms/encoder.go 2014-07-01 12:33:46 +0000
> @@ -31,11 +31,12 @@
> )
>
> type MMSEncoder struct {
> - w io.Writer
> + w io.Writer
> + log string
> }
>
> func NewEncoder(w io.Writer) *MMSEncoder {
> - return &MMSEncoder{w}
> + return &MMSEncoder{w: w}
> }
>
> func (enc *MMSEncoder) Encode(pdu MMSWriter) error {
> @@ -55,11 +56,11 @@
> switch f.Kind() {
> case reflect.Uint:
> case reflect.Uint8:
> - fmt.Printf("%s: %d %#x\n", fieldName, f.Uint(), f.Uint())
> + enc.log = enc.log + fmt.Sprintf("%s: %d %#x\n", fieldName, f.Uint(), f.Uint())
> case reflect.Bool:
> - fmt.Println(fieldName, f.Bool())
> + enc.log = enc.log + fmt.Sprintf(fieldName, f.Bool())
> default:
> - fmt.Println(fieldName, f)
> + enc.log = enc.log + fmt.Sprintf(fieldName, f)
> }
>
> switch fieldName {
> @@ -110,7 +111,7 @@
> }
> }
> if err != nil {
> - return fmt.Errorf("cannot encode field %s with value %s: %s", fieldName, f, err)
> + return fmt.Errorf("cannot encode field %s with value %s: %s ... encoded so far: %s", fieldName, f, err, enc.log)
> }
> }
> return nil
> @@ -198,7 +199,6 @@
> var mt int
> for mt = range CONTENT_TYPES {
> if CONTENT_TYPES[mt] == media {
> - fmt.Println("Media Type is ", media, "in", mt, "which is the same as", CONTENT_TYPES[mt])
> return enc.writeInteger(uint64(mt))
> }
> }
> @@ -218,7 +218,7 @@
>
> func (enc *MMSEncoder) writeStringParam(param byte, s string) error {
> if s == "" {
> - log.Print("Skipping empty string")
> + enc.log = enc.log + "Skipping empty string\n"
> }
> if err := enc.setParam(param); err != nil {
> return err
> @@ -303,6 +303,7 @@
> if i&0x80 < 0x80 {
> return enc.writeShortInteger(i)
> } else {
> + fmt.Sprintf("Writing long int %d\n", i)
> return enc.writeLongInteger(i)
> }
> return nil
>
--
https://code.launchpad.net/~sergiusens/nuntium/stdout_cleanup/+merge/225151
Your team Ubuntu Phablet Team is subscribed to branch lp:nuntium.
More information about the Ubuntu-reviews
mailing list