Merge pull request #90 from appcelerator/timob-16979

[TIMOB-16979] Added better error handling around the analytics event fil...

lib/analytics.js

@@ -245,38 +245,44 @@ process.on('message', function onMessage(args) {
 		}
 
 		// send the analytics events, if any
-		async.each(fs.readdirSync(eventsDir), function (filename, next) {
-			if (!/\.json$/.test(filename)) return next();
+		var files = fs.readdirSync(eventsDir);
+		async.whilst(
+			function () {
+				return files.length;
+			},
+			function (next) {
+				var filename = files.shift(),
+					file = path.join(eventsDir, filename),
+					payload = null
 
-			var file = path.join(eventsDir, filename),
-				payload = null;
+				if (!fs.existsSync(file) || !/\.json$/.test(filename)) return next();
 
-			try {
-				payload = JSON.parse(fs.readFileSync(file));
-			} catch (ex) {}
-
-			if (!payload) {
-				fs.unlinkSync(file);
-				return next();
-			}
+				try {
+					payload = JSON.parse(fs.readFileSync(file));
+				} catch (ex) {}
 
-			request({
-				uri: url,
-				method: 'POST',
-				proxy: args.httpProxyServer || undefined,
-				headers: {
-					Cookie: cookie
-				},
-				rejectUnauthorized: args.rejectUnauthorized === undefined ? true : !!args.rejectUnauthorized,
-				body: urlEncode(payload)
-			}, function (error, response, body) {
-				if (!error && response.statusCode == 204) {
+				if (!payload) {
 					fs.unlinkSync(file);
+					return next();
 				}
-				next();
-			});
-		}, function () {
-			finalize();
-		});
+
+				request({
+					uri: url,
+					method: 'POST',
+					proxy: args.httpProxyServer || undefined,
+					headers: {
+						Cookie: cookie
+					},
+					rejectUnauthorized: args.rejectUnauthorized === undefined ? true : !!args.rejectUnauthorized,
+					body: urlEncode(payload)
+				}, function (error, response, body) {
+					if (!error && response.statusCode == 204 && fs.existsSync(file)) {
+						fs.unlinkSync(file);
+					}
+					next();
+				});
+			},
+			finalize
+		);
 	});
 });