3 files changed, 26 insertions, 13 deletions
diff --git a/finito-postgres/migrations/2018-09-26-160621_bootstrap_finito_schema/up.sql b/finito-postgres/migrations/2018-09-26-160621_bootstrap_finito_schema/up.sql
index 0de1a9e3c6df..18ace393b8d9 100644
--- a/finito-postgres/migrations/2018-09-26-160621_bootstrap_finito_schema/up.sql
+++ b/finito-postgres/migrations/2018-09-26-160621_bootstrap_finito_schema/up.sql
@@ -30,7 +30,7 @@ CREATE TABLE actions (
   event_id UUID NOT NULL REFERENCES events(id),
   content JSONB NOT NULL,
   status ActionStatus NOT NULL,
-  error JSONB
+  error TEXT
 );
 
 CREATE INDEX idx_actions_machines ON actions(fsm_id);
diff --git a/finito-postgres/src/lib.rs b/finito-postgres/src/lib.rs
index af801314298f..ffb2532e55cc 100644
--- a/finito-postgres/src/lib.rs
+++ b/finito-postgres/src/lib.rs
@@ -110,10 +110,9 @@ struct ActionT {
     /// Current status of the action.
     status: ActionStatus,
 
-    /// Serialised error representation, if an error occured during
-    /// processing. TODO: Use some actual error type. Maybe failure
-    /// has serialisation support?
-    error: Option<Value>,
+    /// Detailed (i.e. Debug-trait formatted) error message, if an
+    /// error occured during action processing.
+    error: Option<String>,
 }
 
 // The following functions implement the public interface of
@@ -292,7 +291,7 @@ fn get_action<C, S>(conn: &C, id: Uuid) -> Result<(ActionStatus, S::Action)> whe
 fn update_action_status<C, S>(conn: &C,
                               id: Uuid,
                               status: ActionStatus,
-                              error: Option<Value>,
+                              error: Option<String>,
                               _fsm: PhantomData<S>) -> Result<()> where
     C: GenericConnection,
     S: FSM {
@@ -371,12 +370,26 @@ fn run_action<S>(tx: Transaction, id: Uuid, _fsm: PhantomData<S>)
 
     let result = match status {
         ActionStatus::Pending => {
-            let events = <S as FSM>::act(action);
-            update_action_status(
-                &tx, id, ActionStatus::Completed, None, PhantomData::<S>
-            )?;
-
-            events
+            match <S as FSM>::act(action) {
+                // If the action succeeded, update its status to
+                // completed and return the created events.
+                Ok(events) => {
+                    update_action_status(
+                        &tx, id, ActionStatus::Completed, None, PhantomData::<S>
+                    )?;
+                    events
+                },
+
+                // If the action failed, persist the debug message and
+                // return nothing.
+                Err(err) => {
+                    let msg = Some(format!("{:?}", err));
+                    update_action_status(
+                        &tx, id, ActionStatus::Failed, msg, PhantomData::<S>
+                    )?;
+                    vec![]
+                },
+            }
         },
 
         _ => {
diff --git a/finito-postgres/src/tests.rs b/finito-postgres/src/tests.rs
index 55ada1329143..b1b5821be3c4 100644
--- a/finito-postgres/src/tests.rs
+++ b/finito-postgres/src/tests.rs
@@ -1,5 +1,5 @@
 use super::*;
-use finito;
+
 use finito_door::*;
 use postgres::{Connection, TlsMode};