Merge branch 'master' into db-canceled

sifive · Mar 14, 2024 · b8be4e2 · b8be4e2
2 parents a984c1b + 55ee8ff
commit b8be4e2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/runtime/database.cpp b/src/runtime/database.cpp
@@ -1202,6 +1202,15 @@ JAST JobReflection::to_simple_json() const {
   json.add("endtime", endtime.as_int64());
   json.add("wake_start", wake_start.as_int64());
 
+  std::stringstream tags_stream;
+  for (const auto &tag : tags) {
+    tags_stream << "{<br>"
+                << "  job: " << tag.job << ",<br>"
+                << "  uri: " << tag.uri << ",<br>"
+                << "  content: " << tag.content << "<br>},<br>";
+  }
+  json.add("tags", tags_stream.str());
+
   return json;
 }
 

diff --git a/tools/wake/main.cpp b/tools/wake/main.cpp
@@ -438,6 +438,7 @@ int main(int argc, char **argv) {
       !clo.job_ids.empty() || !clo.output_files.empty() || !clo.input_files.empty() ||
       !clo.labels.empty() || !clo.tags.empty() || clo.last_use || clo.last_exe || clo.failed ||
       clo.tagdag || clo.timeline || clo.taguri || clo.simple || clo.simple_timeline || clo.canceled;
+
   // Arguments are forbidden with these options
   bool noargs =
       is_db_inspection || clo.init || clo.html || clo.global || clo.exports || clo.api || clo.exec;