ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-20 05:37:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix follow / ignore failure handling

Browse Source
This commit is contained in:
Jeremy Lakeman 2017-06-28 12:05:41 +09:30
parent 0cc0f37b52
commit 2356a8ec20
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
java-api/src/org/servalproject/servaldna/meshmb/MeshMBCommon.java
View File

@ -2,6 +2,7 @@ package org.servalproject.servaldna.meshmb;
import org.servalproject.servaldna.PostHelper; import org.servalproject.servaldna.PostHelper;
import org.servalproject.servaldna.ServalDClient; import org.servalproject.servaldna.ServalDClient;
import org.servalproject.servaldna.ServalDFailureException;
import org.servalproject.servaldna.ServalDHttpConnectionFactory; import org.servalproject.servaldna.ServalDHttpConnectionFactory;
import org.servalproject.servaldna.ServalDInterfaceException; import org.servalproject.servaldna.ServalDInterfaceException;
import org.servalproject.servaldna.SigningKey; import org.servalproject.servaldna.SigningKey;
@ -30,9 +31,12 @@ public class MeshMBCommon {
helper.connect(); helper.connect();
helper.writeField("message", text); helper.writeField("message", text);
helper.close(); helper.close();
int responseCode = conn.getResponseCode();
// TODO handle specific errors // TODO specific errors
return conn.getResponseCode(); if (responseCode!=201)
throw new ServalDFailureException("received unexpected HTTP Status "+
conn.getResponseCode()+" " + conn.getResponseMessage()+" from " + conn.getURL());
return responseCode;
} }
public static int alterSubscription(ServalDHttpConnectionFactory connector, Subscriber id, SubscriptionAction action, Subscriber peer, String name) throws ServalDInterfaceException, IOException { public static int alterSubscription(ServalDHttpConnectionFactory connector, Subscriber id, SubscriptionAction action, Subscriber peer, String name) throws ServalDInterfaceException, IOException {
@ -41,11 +45,16 @@ public class MeshMBCommon {
if (name!=null && !"".equals(name)) if (name!=null && !"".equals(name))
parms.add(new ServalDHttpConnectionFactory.QueryParam("name", name)); parms.add(new ServalDHttpConnectionFactory.QueryParam("name", name));
HttpURLConnection conn = connector.newServalDHttpConnection( HttpURLConnection conn = connector.newServalDHttpConnection(
"/restful/meshmb/"+id.signingKey.toHex()+"/"+peer.signingKey.toHex(), "/restful/meshmb/"+id.signingKey.toHex()+"/"+action.toString().toLowerCase()+"/"+peer.signingKey.toHex(),
parms parms
); );
conn.setRequestMethod("POST"); conn.setRequestMethod("POST");
conn.connect(); conn.connect();
return conn.getResponseCode(); int responseCode = conn.getResponseCode();
// TODO specific errors
if (responseCode!=201)
throw new ServalDFailureException("received unexpected HTTP Status "+
conn.getResponseCode()+" " + conn.getResponseMessage()+" from " + conn.getURL());
return responseCode;
} }
} }