Skip to content

Commit 654389f

Browse files
author
Yuhong Guo
committed
Resolve conflict
1 parent 24a52ab commit 654389f

File tree

3 files changed

+1
-12
lines changed

3 files changed

+1
-12
lines changed

java/api/src/main/java/org/ray/api/Ray.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,6 @@ static RayApi internal() {
105105
return impl;
106106
}
107107

108-
/**
109-
* for ray's app's log.
110-
*/
111-
public static DynamicLog getRappLogger() {
112-
return RayLog.rapp;
113-
}
114-
115108
/**
116109
* start a batch, see RayAPI.java for details.
117110
*/

java/ray.config.ini

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ simple_fail_over = false
2828
[ray.java]
2929
;network_interface = en0
3030

31-
; set log level: debug info warn error
32-
log_level = debug
33-
;log_level = warn
34-
3531
[ray.java.start]
3632

3733
; run mode for this app SINGLE_PROCESS | SINGLE_BOX | CLUSTER

java/runtime-common/src/main/java/org/ray/core/RayRuntime.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ public <ContextT, ResultT, CompletionHostT> RayObject<Boolean> startBatch(
488488
@Override
489489
public <ResultT> void endBatch(ResultT r) {
490490
long batchId = UniqueIdHelper.getBatchId(this.getCurrentTaskId());
491-
Ray.getRappLogger().debug("end batch with id " + batchId);
491+
RayLog.rapp.debug("end batch with id " + batchId);
492492
this.putRaw(UniqueIdHelper.batchResultObject(batchId).getId(), r);
493493
}
494494
}

0 commit comments

Comments
 (0)