Merge branch 'devel' of github.com:arangodb/arangodb into devel

mchacki · mchacki · commit 176f66c74fd2 · 2015-03-04T15:24:10.000+01:00
diff --git a/README_maintainers.md b/README_maintainers.md
@@ -24,6 +24,9 @@ At runtime arangod needs to be started with these options:
 --javascript.v8-options="--gdbjit_dump"
 --javascript.v8-options="--gdbjit_full"
 
+Debugging the Make process
+--------------------------
+If the compile goes wrong for no particular reason, appending 'verbose=' adds more output. For some reason V8 has VERBOSE=1 for the same effect.
 
 Runtime
 -------
diff --git a/js/server/modules/org/arangodb/foxx/arangoApp.js b/js/server/modules/org/arangodb/foxx/arangoApp.js
@@ -326,7 +326,7 @@
 
     var full = fs.join(this._root, this._path, filename);
     if (!fs.exists(full)) {
-      throwFileNotFound("Cannot find file " , filename);
+      throwFileNotFound(full);
     }
     var fileContent = fs.read(full);
 

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@`
`326`	`326`
`327`	`327`	`var full = fs.join(this._root, this._path, filename);`
`328`	`328`	`if (!fs.exists(full)) {`
`329`		`- throwFileNotFound("Cannot find file " , filename);`
	`329`	`+ throwFileNotFound(full);`
`330`	`330`	`}`
`331`	`331`	`var fileContent = fs.read(full);`
`332`	`332`