AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 03:05:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

actually implemented http request timeout...

Browse Source
This commit is contained in:
Florian Nücke 2014-01-02 01:59:19 +01:00
parent 8abc285f24
commit 940e83995a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
li/cil/oc/Settings.scala
View File

@ -139,7 +139,7 @@ class Settings(config: Config) {
val httpThreads = config.getInt("http.threads") max 1 val httpThreads = config.getInt("http.threads") max 1
val httpHostBlacklist = Array(config.getStringList("http.blacklist"): _*) val httpHostBlacklist = Array(config.getStringList("http.blacklist"): _*)
val httpHostWhitelist = Array(config.getStringList("http.whitelist"): _*) val httpHostWhitelist = Array(config.getStringList("http.whitelist"): _*)
val httpTimeout = config.getInt("http.requestTimeout") max 0 val httpTimeout = (config.getInt("http.requestTimeout") max 0) * 1000
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //
// misc // misc

5
li/cil/oc/server/component/WirelessNetworkCard.scala
View File

@ -1,7 +1,7 @@
package li.cil.oc.server.component package li.cil.oc.server.component
import java.io._ import java.io._
import java.net.{HttpURLConnection, URL} import java.net.{SocketTimeoutException, HttpURLConnection, URL}
import java.util.concurrent.Future import java.util.concurrent.Future
import java.util.regex.Matcher import java.util.regex.Matcher
import li.cil.oc.api.network._ import li.cil.oc.api.network._
@ -59,6 +59,7 @@ class WirelessNetworkCard(val owner: TileEntity) extends NetworkCard {
if (post.isDefined) { if (post.isDefined) {
http.setRequestMethod("POST") http.setRequestMethod("POST")
http.setDoOutput(true) http.setDoOutput(true)
http.setReadTimeout(Settings.get.httpTimeout)
val out = new BufferedWriter(new OutputStreamWriter(http.getOutputStream)) val out = new BufferedWriter(new OutputStreamWriter(http.getOutputStream))
out.write(post.get) out.write(post.get)
@ -91,6 +92,8 @@ class WirelessNetworkCard(val owner: TileEntity) extends NetworkCard {
catch { catch {
case e: FileNotFoundException => case e: FileNotFoundException =>
context.signal("http_response", address, Unit, "not found: " + Option(e.getMessage).getOrElse(e.toString)) context.signal("http_response", address, Unit, "not found: " + Option(e.getMessage).getOrElse(e.toString))
case _: SocketTimeoutException =>
context.signal("http_response", address, Unit, "timeout")
case e: Throwable => case e: Throwable =>
context.signal("http_response", address, Unit, Option(e.getMessage).getOrElse(e.toString)) context.signal("http_response", address, Unit, Option(e.getMessage).getOrElse(e.toString))
} }