Skip to content

Commit a58cef0

Browse files
author
deb malya
committed
slf4j
1 parent d02ea8c commit a58cef0

4 files changed

Lines changed: 55 additions & 30 deletions

File tree

pom.xml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,28 @@
2222

2323

2424
<dependencies>
25+
<!--
2526
<dependency>
2627
<groupId>log4j</groupId>
2728
<artifactId>log4j</artifactId>
28-
<version>1.2.17</version>
29+
<version>1.1.3</version>
30+
</dependency>
31+
-->
32+
33+
<dependency>
34+
<groupId>org.apache.logging.log4j</groupId>
35+
<artifactId>log4j-api</artifactId>
36+
<version>2.7</version>
37+
</dependency>
38+
<dependency>
39+
<groupId>org.apache.logging.log4j</groupId>
40+
<artifactId>log4j-core</artifactId>
41+
<version>2.7</version>
42+
</dependency>
43+
<dependency>
44+
<groupId>org.apache.logging.log4j</groupId>
45+
<artifactId>log4j-slf4j-impl</artifactId>
46+
<version>2.7</version>
2947
</dependency>
3048

3149
<dependency>

src/main/java/com/deb/ehcache/EhCacheEventListener.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,30 @@
44
*/
55
package com.deb.ehcache;
66

7-
import org.apache.log4j.Logger;
7+
8+
import com.deb.vad.SilenceDetector;
89
import org.ehcache.event.CacheEvent;
910
import org.ehcache.event.CacheEventListener;
11+
import org.slf4j.Logger;
12+
import org.slf4j.LoggerFactory;
13+
1014

1115
/**
1216
* @author debmalyajash
1317
*
1418
*/
1519
public class EhCacheEventListener<K,V> implements CacheEventListener<K, V> {
16-
17-
private static final Logger LOGGER = Logger.getLogger(EhCacheEventListener.class);
20+
21+
private static final Logger logger = LoggerFactory.getLogger(EhCacheEventListener.class);
1822

1923
/* (non-Javadoc)
2024
* @see org.ehcache.event.CacheEventListener#onEvent(org.ehcache.event.CacheEvent)
2125
*/
2226
@Override
2327
public void onEvent(CacheEvent<K, V> event) {
24-
LOGGER.debug(event.getType().toString());
28+
if (logger.isDebugEnabled()) {
29+
logger.debug(event.getType().toString());
30+
}
2531

2632

2733
}

src/main/java/com/deb/vad/SilenceDetector.java

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import javax.sound.sampled.TargetDataLine;
1616

1717
import com.deb.vad.utility.CommonUtil;
18+
import org.slf4j.Logger;
19+
import org.slf4j.LoggerFactory;
1820

1921
/**
2022
* @author debmalyajash
@@ -28,6 +30,8 @@ public class SilenceDetector implements SoundCache{
2830
private static final int ARRAY_SIZE = 8;
2931
public static byte[] SILENCE = new byte[ARRAY_SIZE];
3032

33+
private static final Logger logger = LoggerFactory.getLogger(SilenceDetector.class);
34+
3135
public static void main(final String args[]) {
3236
Thread.currentThread().setName("DebSilenceDetector");
3337
AudioFormat format = CommonUtil.getAudioFormat();
@@ -80,16 +84,19 @@ public static void main(final String args[]) {
8084
Arrays.fill(SILENCE, (byte) 0);
8185
ais.read(b, 0, size);
8286

83-
// System.out.println( System.currentTimeMillis() );
87+
8488
if (Arrays.equals(SILENCE, b)) {
85-
// System.out.println("AS");
89+
if (logger.isInfoEnabled()){
90+
logger.info("~~~ SILENCE ~~~~");
91+
}else {
92+
System.out.println("~~~ SILENCE ~~~~");
93+
}
8694
} else {
87-
// timeBasedAudioInputMap.put(System.currentTimeMillis(), b);
88-
// System.out.println("W");
89-
System.out.println( System.currentTimeMillis() );
90-
System.out.println( b.length );
91-
// System.out.println( "NS" );
92-
System.out.println( Arrays.toString( b ) );
95+
if (logger.isInfoEnabled()){
96+
logger.info(String.format("~~~ NOISE ~~~~ %s",Arrays.toString( b )));
97+
}else{
98+
System.out.println(String.format("~~~ NOISE ~~~~ %s",Arrays.toString( b )));
99+
}
93100
}
94101

95102
// The AudioSystem class provides methods for reading and
@@ -100,7 +107,9 @@ public static void main(final String args[]) {
100107

101108
}
102109
} catch (Throwable e) {
103-
e.printStackTrace();
110+
if (logger.isInfoEnabled()){
111+
logger.error(e.getMessage(),e);
112+
}
104113
} finally {
105114
if (line != null) {
106115
line.flush();

src/main/java/com/deb/vad/SilenceDetectorWithHTreeMap.java

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,17 @@
11
package com.deb.vad;
22

3-
import java.util.Arrays;
4-
import java.util.Date;
5-
import java.util.Map;
6-
7-
import javax.sound.sampled.AudioFormat;
8-
import javax.sound.sampled.AudioInputStream;
9-
import javax.sound.sampled.AudioSystem;
10-
/**
11-
*
12-
*/
13-
import javax.sound.sampled.DataLine;
14-
import javax.sound.sampled.TargetDataLine;
15-
16-
import org.apache.log4j.Logger;
3+
import com.deb.vad.utility.CommonUtil;
174
import org.mapdb.DB;
185
import org.mapdb.DBMaker;
196
import org.mapdb.HTreeMap;
207
import org.mapdb.Serializer;
8+
import org.slf4j.Logger;
9+
import org.slf4j.LoggerFactory;
2110

22-
import com.deb.vad.utility.CommonUtil;
11+
import javax.sound.sampled.*;
12+
import java.util.Arrays;
13+
import java.util.Date;
14+
import java.util.Map;
2315

2416
/**
2517
* @author debmalyajash
@@ -32,7 +24,7 @@ public class SilenceDetectorWithHTreeMap implements SoundCache {
3224
private static final int ARRAY_SIZE = 8;
3325
public static byte[] SILENCE = new byte[ARRAY_SIZE];
3426

35-
private static Logger LOGGER = Logger.getLogger(SilenceDetectorWithHTreeMap.class);
27+
private static Logger LOGGER = LoggerFactory.getLogger(SilenceDetectorWithHTreeMap.class);
3628

3729
/**
3830
* In Memory DB. DBMaker.memoryDB().make();

0 commit comments

Comments
 (0)