Skip to content

Fix compilation on nodejs #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kevinresol merged 2 commits into from
Mar 23, 2016
Merged

Fix compilation on nodejs #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ec3572
Fix compilation on nodejs
kevinresol Dec 29, 2015
55243e9
Fix file logger for nodejs
kevinresol Mar 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions src/ufront/tasks/UFTaskSet.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package ufront.tasks;

#if sys
import mcli.CommandLine;
import mcli.Dispatch;
import minject.Injector;
Expand All @@ -12,6 +11,7 @@ import ufront.log.MessageList;
import ufront.api.UFApi;
import haxe.PosInfos;
using haxe.io.Path;
using StringTools;

class UFTaskSet extends CommandLine {

Expand Down Expand Up @@ -47,23 +47,36 @@ class UFTaskSet extends CommandLine {
**/
@:skip
public function useCLILogging( ?logFile:String ):UFTaskSet {
var logFilePath = null;
var file:FileOutput = null;
if ( logFile!=null ) {
var contentDir:String = injector.getInstance( String, "contentDirectory" );
var logFilePath = contentDir.addTrailingSlash()+logFile;
logFilePath = contentDir.addTrailingSlash()+logFile;
var logFileDirectory = logFilePath.directory();
if ( FileSystem.exists(logFileDirectory)==false )
FileSystem.createDirectory( logFileDirectory );
file = File.append( logFilePath );

var line = '${Date.now()} [UFTask Runner] ${Sys.args()}';
file.writeString( '$line\n' );

#if nodejs
// hxnodejs has no FileInput implemention (yet)
js.node.Fs.appendFileSync( logFilePath, '$line\n' );
#else
file = File.append( logFilePath );
file.writeString( '$line\n' );
#end

}
function onMessage( msg:Message ) {
var line = FileLogger.format( msg );

Sys.println( line );
if ( file!=null ) {
file.writeString( '\t$line\n' );
}
#if nodejs
// hxnodejs has no FileInput implemention (yet)
if ( logFilePath!=null ) js.node.Fs.appendFileSync( logFilePath, '\t$line\n' );
#else
if ( file!=null ) file.writeString( '\t$line\n' );
#end
}
haxe.Log.trace = function(msg:Dynamic,?pos:PosInfos) onMessage({ msg: msg, pos: pos, type:MTrace });
injector.map( MessageList ).toValue( new MessageList(onMessage) );
Expand Down Expand Up @@ -141,4 +154,3 @@ class UFTaskSet extends CommandLine {
**/
@:noCompletion inline function ufError( msg:Dynamic, ?pos:PosInfos ) messages.push({ msg: msg, pos: pos, type:MError });
}
#end