import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import java.util.concurrent.TimeUnit;
import javax.net.SocketFactory;
import net.pterodactylus.irc.event.ChannelJoined;
import net.pterodactylus.irc.event.NoNicknameGivenReceived;
import net.pterodactylus.irc.event.PrivateMessageReceived;
import net.pterodactylus.irc.event.PrivateNoticeReceived;
+import net.pterodactylus.irc.event.ReplyReceived;
import net.pterodactylus.irc.event.UnknownReplyReceived;
import net.pterodactylus.irc.util.RandomNickname;
import net.pterodactylus.xdcc.util.io.BandwidthCountingInputStream;
import com.google.common.primitives.Longs;
import com.google.common.util.concurrent.AbstractExecutionThreadService;
import com.google.common.util.concurrent.Service;
+import org.apache.log4j.Logger;
/**
* A connection to an IRC server.
* if an I/O error occurs
*/
public void close() throws IOException {
- connectionHandler.close();
+ if (connectionHandler != null) {
+ connectionHandler.close();
+ }
}
//
/* connect to remote socket. */
try {
Socket socket = socketFactory.createSocket(hostname, port);
+ socket.setSoTimeout((int) TimeUnit.MINUTES.toMillis(3));
connectionHandler = new ConnectionHandler(socket.getInputStream(), socket.getOutputStream());
/* register connection. */
while (connected) {
Reply reply = connectionHandler.readReply();
- logger.finest(String.format("<< %s", reply));
+ eventBus.post(new ReplyReceived(this, reply));
+ logger.trace(String.format("<< %s", reply));
String command = reply.command();
List<String> parameters = reply.parameters();
char modeSymbol = parameter.charAt(closeParen + modeCharacterIndex);
nickPrefixes.put(String.valueOf(modeSymbol), String.valueOf(modeCharacter));
}
- logger.fine(String.format("Parsed Prefixes: %s", nickPrefixes));
+ logger.debug(String.format("Parsed Prefixes: %s", nickPrefixes));
}
} else if (parameter.startsWith("CHANTYPES=")) {
for (int typeIndex = 10; typeIndex < parameter.length(); ++typeIndex) {
channelTypes.add(parameter.charAt(typeIndex));
}
- logger.fine(String.format("Parsed Channel Types: %s", channelTypes));
+ logger.debug(String.format("Parsed Channel Types: %s", channelTypes));
}
}
}
eventBus.post(new ConnectionClosed(this));
} catch (IOException ioe1) {
- logger.log(Level.WARNING, "I/O error", ioe1);
+ logger.warn("I/O error", ioe1);
eventBus.post(new ConnectionClosed(this, ioe1));
} catch (RuntimeException re1) {
- logger.log(Level.SEVERE, "Runtime error", re1);
+ logger.error("Runtime error", re1);
eventBus.post(new ConnectionClosed(this, re1));
} finally {
established = false;
if (inetAddress.isPresent() && port.isPresent()) {
eventBus.post(new DccSendReceived(this, client, messageWords[2], inetAddress.get(), port.get(), fileSize));
} else {
- logger.warning(String.format("Received malformed DCC SEND: “%s”", message));
+ logger.warn(String.format("Received malformed DCC SEND: “%s”", message));
}
} else if (messageWords[1].equalsIgnoreCase("ACCEPT")) {
Optional<Integer> port = Optional.fromNullable(Ints.tryParse(messageWords[3]));
if (port.isPresent()) {
eventBus.post(new DccAcceptReceived(this, client, messageWords[2], port.get(), position));
} else {
- logger.warning(String.format("Received malformed DCC ACCEPT: “%s”", message));
+ logger.warn(String.format("Received malformed DCC ACCEPT: “%s”", message));
}
}
}
commandBuilder.append(parameter);
}
- logger.finest(String.format(">> %s", commandBuilder));
+ logger.trace(String.format(">> %s", commandBuilder));
outputStream.write((commandBuilder.toString() + "\r\n").getBytes("UTF-8"));
outputStream.flush();
}
public void close() throws IOException {
Closeables.close(outputStream, true);
Closeables.close(inputStreamReader, true);
+ Closeables.close(inputStream, true);
}
}