Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(prov-dev, deps): Add better logging to provisioning device client #746

Merged
merged 2 commits into from
Mar 30, 2020
Merged

refactor(prov-dev, deps): Add better logging to provisioning device client #746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fc4c8b
refactor(prov-dev, deps): Add better logging to provisioning device c…
timtay-microsoft Mar 27, 2020
39c8b99
squash
timtay-microsoft Mar 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 17 additions & 33 deletions deps/src/main/java/com/microsoft/azure/sdk/iot/deps/transport/amqp/AmqpDeviceOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,30 +79,22 @@ else if (this.receiverLink == null)
/**
* Open the Session links for session
* @param session the {@link Session} endpoint.
* @throws IOException if the function failed to open the links for the provided session.
* @throws IllegalArgumentException if the session is {@code null}.
*/
public void openLinks(Session session) throws IOException, IllegalArgumentException
public void openLinks(Session session) throws IllegalArgumentException
{
if (session == null)
{
throw new IllegalArgumentException("The session cannot be null.");
}

try
{
this.receiverLink = session.receiver(this.receiverLinkTag);
this.receiverLink.setProperties(this.amqpProperties);
this.receiverLink.open();
this.receiverLink = session.receiver(this.receiverLinkTag);
this.receiverLink.setProperties(this.amqpProperties);
this.receiverLink.open();

this.senderLink = session.sender(this.senderLinkTag);
this.senderLink.setProperties(this.amqpProperties);
this.senderLink.open();
}
catch (Exception e)
{
throw new IOException("Proton exception", e);
}
this.senderLink = session.sender(this.senderLinkTag);
this.senderLink.setProperties(this.amqpProperties);
this.senderLink.open();
}

/**
Expand All @@ -126,34 +118,26 @@ public synchronized boolean isReceiverLinkTag(String name)
* Initializes the link's other endpoint according to its type
* @param link The link which shall be initialize.
* @throws IllegalArgumentException if link argument is null
* @throws IOException if Proton throws
*/
public synchronized void initLink(Link link) throws IOException, IllegalArgumentException
public synchronized void initLink(Link link) throws IllegalArgumentException
{
if (link == null)
{
throw new IllegalArgumentException("The link cannot be null.");
}

try
if (link.getName().equals(this.senderLinkTag))
{
if (link.getName().equals(this.senderLinkTag))
{
Target target = new Target();
target.setAddress(this.amqpLinkAddress);
link.setTarget(target);
link.setSenderSettleMode(SenderSettleMode.UNSETTLED);
}
if (link.getName().equals(this.receiverLinkTag))
{
Source source = new Source();
source.setAddress(this.amqpLinkAddress);
link.setSource(source);
}
Target target = new Target();
target.setAddress(this.amqpLinkAddress);
link.setTarget(target);
link.setSenderSettleMode(SenderSettleMode.UNSETTLED);
}
catch (Exception e)
else if (link.getName().equals(this.receiverLinkTag))
{
throw new IOException("Proton exception: " + e.getMessage());
Source source = new Source();
source.setAddress(this.amqpLinkAddress);
link.setSource(source);
}
}

Expand Down
2 changes: 2 additions & 0 deletions deps/src/main/java/com/microsoft/azure/sdk/iot/deps/transport/amqp/AmqpListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ public interface AmqpListener
void connectionLost();

void messageSent();

void messageSendFailed(String exceptionMessage);
}
Loading