Skip to content

Commit fd447c5

Browse files
committed
Fix small nbf->naf bug in db.CreateOrder
- still needs unit test
1 parent a785131 commit fd447c5

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

acme/db/nosql/order.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package nosql
33
import (
44
"context"
55
"encoding/json"
6+
"fmt"
67
"sync"
78
"time"
89

@@ -91,9 +92,10 @@ func (db *DB) CreateOrder(ctx context.Context, o *acme.Order) error {
9192
ExpiresAt: o.ExpiresAt,
9293
Identifiers: o.Identifiers,
9394
NotBefore: o.NotBefore,
94-
NotAfter: o.NotBefore,
95+
NotAfter: o.NotAfter,
9596
AuthorizationIDs: o.AuthorizationIDs,
9697
}
98+
fmt.Printf("dbo = %+v\n", dbo)
9799
if err := db.save(ctx, o.ID, dbo, nil, "order", orderTable); err != nil {
98100
return err
99101
}

acme/errors.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package acme
22

33
import (
4+
"encoding/json"
45
"fmt"
56

67
"github.com/pkg/errors"
@@ -337,3 +338,12 @@ func (e *Error) Cause() error {
337338
}
338339
return e.Err
339340
}
341+
342+
// ToLog implements the EnableLogger interface.
343+
func (e *Error) ToLog() (interface{}, error) {
344+
b, err := json.Marshal(e)
345+
if err != nil {
346+
return nil, WrapErrorISE(err, "error marshaling acme.Error for logging")
347+
}
348+
return string(b), nil
349+
}

api/errors.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,15 @@ func WriteError(w http.ResponseWriter, err error) {
3333

3434
// Write errors in the response writer
3535
if rl, ok := w.(logging.ResponseLogger); ok {
36+
logErr := err
37+
if u, ok := err.(*acme.Error); ok {
38+
logErr = u.Err
39+
}
3640
rl.WithFields(map[string]interface{}{
37-
"error": err,
41+
"error": logErr,
3842
})
3943
if os.Getenv("STEPDEBUG") == "1" {
40-
if e, ok := err.(errs.StackTracer); ok {
44+
if e, ok := logErr.(errs.StackTracer); ok {
4145
rl.WithFields(map[string]interface{}{
4246
"stack-trace": fmt.Sprintf("%+v", e),
4347
})

0 commit comments

Comments
 (0)