Moved json files to subdirectory

Changed to write and read from subdirectory. Also put graphml files in gml subdirectory. Changed js to read from /json
adrianco · Mar 26, 2015 · 44d7481 · 44d7481
1 parent 7d59151
commit 44d7481
Show file tree

Hide file tree

Showing 44 changed files with 1,561 additions and 923 deletions.
diff --git a/collect/collect.go b/collect/collect.go
@@ -33,7 +33,7 @@ func Measure(h *metrics.Histogram, d time.Duration) {
 
 func Save() {
 	if archaius.Conf.Collect {
-		file, _ := os.Create(archaius.Conf.Arch + "_metrics.json")
+		file, _ := os.Create("json/" + archaius.Conf.Arch + "_metrics.json")
 		counters, gauges := metrics.Snapshot()
 		cj, _ := json.Marshal(counters)
 		gj, _ := json.Marshal(gauges)

diff --git a/fsm.graphml → gml/fsm.graphml b/fsm.graphml → gml/fsm.graphml
diff --git a/gml/migration9.graphml b/gml/migration9.graphml
diff --git a/netflixoss.graphml → gml/netflixoss.graphml b/netflixoss.graphml → gml/netflixoss.graphml
diff --git a/graphjson/graphjson.go b/graphjson/graphjson.go
@@ -58,7 +58,7 @@ func Setup(arch string) {
 	if Enabled == false {
 		return
 	}
-	file, _ = os.Create(arch + ".json")
+	file, _ = os.Create("json/" + arch + ".json")
 	Write(fmt.Sprintf("{\n  \"arch\":\"%v\",\n  \"version\":\"spigo-0.3\",\n  \"args\":\"%v\",\n  \"graph\":[", arch, os.Args))
 	comma = false
 }

diff --git a/graphml/graphml.go b/graphml/graphml.go
@@ -18,7 +18,7 @@ func Setup(filename string) {
 	if Enabled == false {
 		return
 	}
-	file, _ = os.Create(filename + ".graphml")
+	file, _ = os.Create("gml/" + filename + ".graphml")
 	file.WriteString(
 		"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n  <graphml xmlns=\"http://graphml.graphdrawing.org/xmlns/graphml\"\n   xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n   xsi:schemaLocation=\"http://graphml.graphdrawing.org/xmlns/graphml http://www.yworks.com/xml/schema/graphml/1.0/ygraphml.xsd\"\n    xmlns:y=\"http://www.yworks.com/xml/graphml\">\n    <key id=\"d0\" for=\"node\" yfiles.type=\"nodegraphics\"/>\n    <key id=\"d1\" for=\"edge\" yfiles.type=\"edgegraphics\"/>\n    <key id=\"d2\" for=\"node\" attr.name=\"Text\" attr.type=\"string\"/>\n    <graph id=\"spigo\" edgedefault=\"directed\">\n")
 }

diff --git a/fsm.json → json/fsm.json b/fsm.json → json/fsm.json
diff --git a/fsm_metrics.json → json/fsm_metrics.json b/fsm_metrics.json → json/fsm_metrics.json
diff --git a/lamp.json → json/lamp.json b/lamp.json → json/lamp.json
diff --git a/lamp1.json → json/lamp1.json b/lamp1.json → json/lamp1.json
diff --git a/lamp2.json → json/lamp2.json b/lamp2.json → json/lamp2.json
diff --git a/lamp3.json → json/lamp3.json b/lamp3.json → json/lamp3.json
diff --git a/lamp4.json → json/lamp4.json b/lamp4.json → json/lamp4.json
diff --git a/lamp5.json → json/lamp5.json b/lamp5.json → json/lamp5.json
diff --git a/lamp6.json → json/lamp6.json b/lamp6.json → json/lamp6.json
diff --git a/lamp7.json → json/lamp7.json b/lamp7.json → json/lamp7.json
diff --git a/lamp8.json → json/lamp8.json b/lamp8.json → json/lamp8.json
diff --git a/lamp9.json → json/lamp9.json b/lamp9.json → json/lamp9.json
diff --git a/migration.json → json/migration.json b/migration.json → json/migration.json
diff --git a/migration1.json → json/migration1.json b/migration1.json → json/migration1.json
diff --git a/migration2.json → json/migration2.json b/migration2.json → json/migration2.json
diff --git a/migration3.json → json/migration3.json b/migration3.json → json/migration3.json
diff --git a/migration4.json → json/migration4.json b/migration4.json → json/migration4.json
diff --git a/migration5.json → json/migration5.json b/migration5.json → json/migration5.json
diff --git a/migration6.json → json/migration6.json b/migration6.json → json/migration6.json
diff --git a/migration7.json → json/migration7.json b/migration7.json → json/migration7.json
diff --git a/migration8.json → json/migration8.json b/migration8.json → json/migration8.json
diff --git a/json/migration9.json b/json/migration9.json
diff --git a/json/migration_metrics.json b/json/migration_metrics.json
diff --git a/netflixoss.json → json/netflixoss.json b/netflixoss.json → json/netflixoss.json
diff --git a/netflixoss1.json → json/netflixoss1.json b/netflixoss1.json → json/netflixoss1.json
diff --git a/netflixoss2.json → json/netflixoss2.json b/netflixoss2.json → json/netflixoss2.json
diff --git a/netflixoss3.json → json/netflixoss3.json b/netflixoss3.json → json/netflixoss3.json
diff --git a/netflixoss4.json → json/netflixoss4.json b/netflixoss4.json → json/netflixoss4.json
diff --git a/netflixoss5.json → json/netflixoss5.json b/netflixoss5.json → json/netflixoss5.json
diff --git a/netflixoss6.json → json/netflixoss6.json b/netflixoss6.json → json/netflixoss6.json
diff --git a/netflixoss7.json → json/netflixoss7.json b/netflixoss7.json → json/netflixoss7.json
diff --git a/netflixoss8.json → json/netflixoss8.json b/netflixoss8.json → json/netflixoss8.json
diff --git a/netflixoss9.json → json/netflixoss9.json b/netflixoss9.json → json/netflixoss9.json
diff --git a/netflixoss_metrics.json → json/netflixoss_metrics.json b/netflixoss_metrics.json → json/netflixoss_metrics.json
diff --git a/migration9.json b/migration9.json
diff --git a/spigo b/spigo
diff --git a/spigo.go b/spigo.go
@@ -1,5 +1,5 @@
 // Package main for spigo - simulate protocol interactions in go.
-// Terminology is a mix of promise theory and flying spaghetti monster lore
+// Terminology is a mix of NetflixOSS, promise theory and flying spaghetti monster lore
 package main
 
 import (

diff --git a/ui/js/app.js b/ui/js/app.js
@@ -174,7 +174,7 @@
 
 		step = (query.step && query.step !== 0) ? query.step : '';
 		architecture = (query.arch) ? query.arch : 'migration';
-		var jsonFile = architecture + step + '.json';
+		var jsonFile = 'json/' + architecture + step + '.json';
 
 		d3.json(jsonFile, function(error, json) {
 			if (error) {