Partial work on gathering details of job events.

1 files changed, 57 insertions, 6 deletions

diff --git a/src/lib/analytics.cc b/src/lib/analytics.cc
index a4582d7ef..59abfba02 100644
--- a/src/lib/analytics.cc
+++ b/src/lib/analytics.cc
@@ -35,19 +35,64 @@ using boost::algorithm::trim;
 Analytics* Analytics::_instance;
 int const Analytics::_current_version = 1;
 
+Event::Event (cxml::ConstNodePtr node)
+{
+	_time.tv_sec = node->number_child<int64_t>("Time");
+	_time.tv_usec = 0;
+	BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children()) {
+		set(i->name(), i->content());
+	}
+}
+
+void
+Event::set (string k, string v)
+{
+	_data[k] = v;
+}
+
+void
+Event::as_xml (cxml::NodePtr parent)
+{
+	/* It would be nice if this had timezone */
+	parent->add_child("Time")->add_child_text(raw_convert<int64_t>(_time.tv_sec));
+	for (map<string, string>::const_iterator i = _data.begin(); i != _data.end(); ++i) {
+		parent->add_child(i->first)->add_child_text(i->second);
+	}
+}
+
 Analytics::Analytics ()
-	: _successful_dcp_encodes (0)
 {
 
 }
 
+int
+Analytics::successful_dcp_encodes () const
+{
+	boost::mutex::scoped_lock lm (_mutex);
+	BOOST_FOREACH (Event e, _events) {
+		cout << e.dump() << "\n";
+	}
+}
+
 void
-Analytics::successful_dcp_encode ()
+Analytics::job_state_changed (shared_ptr<Job> job)
 {
-	++_successful_dcp_encodes;
+	Event ev;
+	ev.set ("type", "job-state");
+	ev.set ("json_name", job->json_name());
+	ev.set ("sub_name", job->sub_name());
+	ev.set ("error-summary", job->error_summary());
+	ev.set ("error-details", job->error_details());
+	ev.set ("status", job->json_status());
+
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_events.push_back (ev);
+	}
+
 	write ();
 
-	if (_successful_dcp_encodes == 3) {
+	if (successful_dcp_encodes() == 3) {
 		emit (
 			boost::bind(
 				boost::ref(Message),
@@ -84,7 +129,10 @@ Analytics::write () const
 	xmlpp::Element* root = doc.create_root_node ("Analytics");
 
 	root->add_child("Version")->add_child_text(raw_convert<string>(_current_version));
-	root->add_child("SuccessfulDCPEncodes")->add_child_text(raw_convert<string>(_successful_dcp_encodes));
+	boost::mutex::scoped_lock lm (_mutex);
+	BOOST_FOREACH (Event e, _events) {
+		e.as_xml (root->add_child("Event"));
+	}
 
 	try {
 		doc.write_to_file_formatted(path("analytics.xml").string());
@@ -101,7 +149,10 @@ try
 {
 	cxml::Document f ("Analytics");
 	f.read_file (path("analytics.xml"));
-	_successful_dcp_encodes = f.number_child<int>("SuccessfulDCPEncodes");
+	boost::mutex::scoped_lock lm (_mutex);
+	BOOST_FOREACH (cxml::ConstNodePtr i, f.node_children("Event")) {
+		_events.push_back (Event(i));
+	}
 } catch (...) {
 	/* Never mind */
 }